[Pkg-Cyrus-imapd-Debian-devel] [SVN] r179 - trunk/cyrus-imapd-2.2.12/debian/patches/99-update-autoconf.dpatch

[debian at incase.de]

Author: sven
Date: Fri Nov 11 21:19:26 2005
New Revision: 179

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=179
Log:
Update 99-update-autoconf dpatch according to previous changeset
Modified:
    trunk/cyrus-imapd-2.2.12/debian/patches/99-update-autoconf.dpatch

Modified: trunk/cyrus-imapd-2.2.12/debian/patches/99-update-autoconf.dpatch
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/patches/99-update-autoconf.dpatch?view=diff&rev=179&p1=trunk/cyrus-imapd-2.2.12/debian/patches/99-update-autoconf.dpatch&r1=178&p2=trunk/cyrus-imapd-2.2.12/debian/patches/99-update-autoconf.dpatch&r2=179
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/patches/99-update-autoconf.dpatch (original)
+++ trunk/cyrus-imapd-2.2.12/debian/patches/99-update-autoconf.dpatch Fri Nov 11 21:19:26 2005
@@ -6,10 +6,20 @@
 ## DP: (drac and 64bit-quota)
 
 @DPATCH@
-diff -urN cyrus-imapd-2.2.12/config.h.in cyrus-imapd-2.2.12~/config.h.in
---- cyrus-imapd-2.2.12/config.h.in	2005-08-30 14:42:26.000000000 +0200
-+++ cyrus-imapd-2.2.12~/config.h.in	2005-08-30 14:37:05.000000000 +0200
-@@ -147,8 +147,8 @@
+diff -urNad cyrus-imapd-2.2.12/config.h.in /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/config.h.in
+--- cyrus-imapd-2.2.12/config.h.in	2005-11-11 19:21:57.000000000 +0100
++++ /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/config.h.in	2005-11-11 20:46:36.707433160 +0100
+@@ -55,6 +55,9 @@
+ /* What user will we run as? */
+ #undef CYRUS_USER
+ 
++/* Build DRAC support? */
++#undef DRAC_AUTH
++
+ /* Alternative to /dev/urandom? */
+ #undef EGD_SOCKET
+ 
+@@ -147,8 +150,8 @@
  /* Do we have TCP wrappers? */
  #undef HAVE_LIBWRAP
  
@@ -20,7 +30,7 @@
  
  /* Define to 1 if you have the `memmove' function. */
  #undef HAVE_MEMMOVE
-@@ -298,6 +298,12 @@
+@@ -298,6 +301,12 @@
  /* Directiory to use for service binaries */
  #undef SERVICE_PATH
  
@@ -33,7 +43,7 @@
  /* Do we already have setproctitle? */
  #undef SPT_TYPE
  
-@@ -322,6 +328,10 @@
+@@ -322,6 +331,10 @@
  /* Build in PTS support? */
  #undef WITH_PTS
  
@@ -44,7 +54,7 @@
  /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
     `char[]'. */
  #undef YYTEXT_POINTER
-@@ -336,9 +346,11 @@
+@@ -336,9 +349,11 @@
  /* Define to empty if `const' does not conform to ANSI C. */
  #undef const
  
@@ -58,7 +68,7 @@
  
  
  /* time.h */
-@@ -479,7 +491,11 @@
+@@ -479,7 +494,11 @@
      SQUAT_ENGINE = 1,
  
      /* should we have long LMTP error messages? */
@@ -71,9 +81,9 @@
  };
  
  #endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urN cyrus-imapd-2.2.12/configure cyrus-imapd-2.2.12~/configure
---- cyrus-imapd-2.2.12/configure	2005-08-30 14:42:21.000000000 +0200
-+++ cyrus-imapd-2.2.12~/configure	2005-08-30 14:37:05.000000000 +0200
+diff -urNad cyrus-imapd-2.2.12/configure /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/configure
+--- cyrus-imapd-2.2.12/configure	2005-11-11 19:21:57.000000000 +0100
++++ /tmp/dpep.vVKcNy/cyrus-imapd-2.2.12/configure	2005-11-11 20:46:36.953409030 +0100
 @@ -1,9 +1,8 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -132,7 +142,7 @@
  #endif"
  
 -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WARNERROR MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os WARNERROR MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS DRACLIBS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -180,7 +190,15 @@
    --disable-sieve         disable Sieve support
    --enable-krb5afspts     compile afskrb PTS module with krb5 support
    --disable-server        disable compiling servers
-@@ -940,12 +942,45 @@
+@@ -892,6 +894,7 @@
+   --with-sasl=DIR         Compile with libsasl2 in <DIR>
+   --with-staticsasl=DIR   Compile with staticly linked libsasl2 in <DIR>
+   --with-perl=PERL        use PERL for perl
++  --with-drac=DIR         use DRAC library in <DIR> no
+   --with-libwrap=DIR      use libwrap (rooted in DIR) yes
+   --with-snmp=DIR         use ucd|net snmp (rooted in DIR) yes
+ 
+@@ -940,12 +943,45 @@
      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
      ac_top_srcdir=$ac_top_builddir$srcdir ;;
  esac
@@ -232,7 +250,7 @@
  
      cd $ac_dir
      # Check for guested configure; otherwise get Cygnus style configure.
-@@ -956,13 +991,13 @@
+@@ -956,13 +992,13 @@
        echo
        $SHELL $ac_srcdir/configure  --help=recursive
      elif test -f $ac_srcdir/configure.ac ||
@@ -248,7 +266,7 @@
    done
  fi
  
-@@ -970,8 +1005,7 @@
+@@ -970,8 +1006,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
  
@@ -258,7 +276,7 @@
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
-@@ -983,7 +1017,7 @@
+@@ -983,7 +1018,7 @@
  running configure, to aid debugging if configure makes a mistake.
  
  It was created by $as_me, which was
@@ -267,7 +285,7 @@
  
    $ $0 $@
  
-@@ -1060,19 +1094,19 @@
+@@ -1060,19 +1095,19 @@
      2)
        ac_configure_args1="$ac_configure_args1 '$ac_arg'"
        if test $ac_must_keep_next = true; then
@@ -299,7 +317,7 @@
        fi
        ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
        # Get rid of the leading space.
-@@ -1106,12 +1140,12 @@
+@@ -1106,12 +1141,12 @@
      case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
      *ac_space=\ *)
        sed -n \
@@ -315,7 +333,7 @@
        ;;
      esac;
  }
-@@ -1140,7 +1174,7 @@
+@@ -1140,7 +1175,7 @@
        for ac_var in $ac_subst_files
        do
  	eval ac_val=$`echo $ac_var`
@@ -324,7 +342,7 @@
        done | sort
        echo
      fi
-@@ -1159,7 +1193,7 @@
+@@ -1159,7 +1194,7 @@
        echo "$as_me: caught signal $ac_signal"
      echo "$as_me: exit $exit_status"
    } >&5
@@ -333,7 +351,7 @@
    rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
      exit $exit_status
       ' 0
-@@ -1239,7 +1273,7 @@
+@@ -1239,7 +1274,7 @@
  # value.
  ac_cache_corrupted=false
  for ac_var in `(set) 2>&1 |
@@ -342,7 +360,7 @@
    eval ac_old_set=\$ac_cv_env_${ac_var}_set
    eval ac_new_set=\$ac_env_${ac_var}_set
    eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-@@ -1256,13 +1290,13 @@
+@@ -1256,13 +1291,13 @@
      ,);;
      *)
        if test "x$ac_old_val" != "x$ac_new_val"; then
@@ -360,7 +378,7 @@
        fi;;
    esac
    # Pass precious variables to config.status.
-@@ -1393,6 +1427,14 @@
+@@ -1393,6 +1428,14 @@
  
  
  
@@ -375,7 +393,7 @@
  
  # Check whether --with-extraident or --without-extraident was given.
  if test "${with_extraident+set}" = set; then
-@@ -1853,7 +1895,6 @@
+@@ -1853,7 +1896,6 @@
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
@@ -383,7 +401,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -1873,8 +1914,8 @@
+@@ -1873,8 +1915,8 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -394,7 +412,7 @@
  ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
-@@ -1894,23 +1935,23 @@
+@@ -1894,23 +1936,23 @@
    test -f "$ac_file" || continue
    case $ac_file in
      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
@@ -431,7 +449,7 @@
    esac
  done
  else
-@@ -1984,8 +2025,8 @@
+@@ -1984,8 +2026,8 @@
    case $ac_file in
      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
@@ -442,7 +460,7 @@
      * ) break;;
    esac
  done
-@@ -2010,7 +2051,6 @@
+@@ -2010,7 +2052,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -450,7 +468,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2061,7 +2101,6 @@
+@@ -2061,7 +2102,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -458,7 +476,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2081,11 +2120,20 @@
+@@ -2081,11 +2121,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -481,7 +499,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2098,7 +2146,7 @@
+@@ -2098,7 +2147,7 @@
  
  ac_compiler_gnu=no
  fi
@@ -490,7 +508,7 @@
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
-@@ -2114,7 +2162,6 @@
+@@ -2114,7 +2163,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -498,7 +516,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2131,11 +2178,20 @@
+@@ -2131,11 +2179,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -521,7 +539,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2148,7 +2204,7 @@
+@@ -2148,7 +2205,7 @@
  
  ac_cv_prog_cc_g=no
  fi
@@ -530,7 +548,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
  echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-@@ -2175,7 +2231,6 @@
+@@ -2175,7 +2232,6 @@
    ac_cv_prog_cc_stdc=no
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
@@ -538,7 +556,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2203,6 +2258,16 @@
+@@ -2203,6 +2259,16 @@
    va_end (v);
    return s;
  }
@@ -555,7 +573,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2229,11 +2294,20 @@
+@@ -2229,11 +2295,20 @@
    CC="$ac_save_CC $ac_arg"
    rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -578,7 +596,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2246,7 +2320,7 @@
+@@ -2246,7 +2321,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -587,7 +605,7 @@
  done
  rm -f conftest.$ac_ext conftest.$ac_objext
  CC=$ac_save_CC
-@@ -2274,19 +2348,27 @@
+@@ -2274,19 +2349,27 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -619,7 +637,7 @@
     'extern "C" void std::exit (int) throw (); using std::exit;' \
     'extern "C" void std::exit (int); using std::exit;' \
     'extern "C" void exit (int) throw ();' \
-@@ -2294,14 +2376,13 @@
+@@ -2294,14 +2377,13 @@
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
@@ -635,7 +653,7 @@
  int
  main ()
  {
-@@ -2312,11 +2393,20 @@
+@@ -2312,11 +2394,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -658,7 +676,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2329,9 +2419,8 @@
+@@ -2329,9 +2420,8 @@
  
  continue
  fi
@@ -669,7 +687,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2348,11 +2437,20 @@
+@@ -2348,11 +2438,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -692,7 +710,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2364,7 +2462,7 @@
+@@ -2364,7 +2463,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -701,7 +719,7 @@
  done
  rm -f conftest*
  if test -n "$ac_declaration"; then
-@@ -2378,7 +2476,7 @@
+@@ -2378,7 +2477,7 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -710,7 +728,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2467,7 +2565,7 @@
+@@ -2467,7 +2566,7 @@
  
  echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
  echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
@@ -719,7 +737,7 @@
  if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2505,6 +2603,7 @@
+@@ -2505,6 +2604,7 @@
  # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
@@ -727,7 +745,7 @@
  # ./install, which can be erroneously created by make from ./install.sh.
  echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
  echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-@@ -2521,6 +2620,7 @@
+@@ -2521,6 +2621,7 @@
  case $as_dir/ in
    ./ | .// | /cC/* | \
    /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
@@ -735,7 +753,7 @@
    /usr/ucb/* ) ;;
    *)
      # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2528,20 +2628,20 @@
+@@ -2528,20 +2629,20 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -770,7 +788,7 @@
        done
      done
      ;;
-@@ -2600,7 +2700,6 @@
+@@ -2600,7 +2701,6 @@
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
@@ -778,7 +796,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2611,7 +2710,7 @@
+@@ -2611,7 +2711,7 @@
  #else
  # include <assert.h>
  #endif
@@ -787,7 +805,7 @@
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -2623,6 +2722,7 @@
+@@ -2623,6 +2723,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -795,7 +813,7 @@
    else
      ac_cpp_err=
    fi
-@@ -2643,7 +2743,6 @@
+@@ -2643,7 +2744,6 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
@@ -803,7 +821,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2661,6 +2760,7 @@
+@@ -2661,6 +2761,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -811,7 +829,7 @@
    else
      ac_cpp_err=
    fi
-@@ -2707,7 +2807,6 @@
+@@ -2707,7 +2808,6 @@
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp. "Syntax error" is here to catch this case.
    cat >conftest.$ac_ext <<_ACEOF
@@ -819,7 +837,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2718,7 +2817,7 @@
+@@ -2718,7 +2818,7 @@
  #else
  # include <assert.h>
  #endif
@@ -828,7 +846,7 @@
  _ACEOF
  if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
    (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -2730,6 +2829,7 @@
+@@ -2730,6 +2830,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -836,7 +854,7 @@
    else
      ac_cpp_err=
    fi
-@@ -2750,7 +2850,6 @@
+@@ -2750,7 +2851,6 @@
    # OK, works on sane cases.  Now check whether non-existent headers
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
@@ -844,7 +862,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2768,6 +2867,7 @@
+@@ -2768,6 +2868,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -852,7 +870,7 @@
    else
      ac_cpp_err=
    fi
-@@ -2826,7 +2926,6 @@
+@@ -2826,7 +2927,6 @@
  echo "$as_me:$LINENO: checking for AIX" >&5
  echo $ECHO_N "checking for AIX... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -860,7 +878,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2852,16 +2951,14 @@
+@@ -2852,16 +2952,14 @@
  rm -f conftest*
  
  
@@ -882,7 +900,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2885,33 +2982,98 @@
+@@ -2885,33 +2983,98 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -992,7 +1010,7 @@
  
  for ac_prog in gawk mawk nawk awk
  do
-@@ -2959,7 +3121,6 @@
+@@ -2959,7 +3122,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -1000,7 +1018,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3022,11 +3183,20 @@
+@@ -3022,11 +3184,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1023,7 +1041,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3039,7 +3209,7 @@
+@@ -3039,7 +3210,7 @@
  
  ac_cv_c_const=no
  fi
@@ -1032,7 +1050,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
  echo "${ECHO_T}$ac_cv_c_const" >&6
-@@ -3051,60 +3221,6 @@
+@@ -3051,60 +3222,6 @@
  
  fi
  
@@ -1093,7 +1111,7 @@
  echo "$as_me:$LINENO: checking for inline" >&5
  echo $ECHO_N "checking for inline... $ECHO_C" >&6
  if test "${ac_cv_c_inline+set}" = set; then
-@@ -3113,7 +3229,6 @@
+@@ -3113,7 +3230,6 @@
    ac_cv_c_inline=no
  for ac_kw in inline __inline__ __inline; do
    cat >conftest.$ac_ext <<_ACEOF
@@ -1101,7 +1119,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3128,11 +3243,20 @@
+@@ -3128,11 +3244,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1124,7 +1142,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3144,268 +3268,1106 @@
+@@ -3144,119 +3269,442 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -1231,26 +1249,21 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -ac_cv___attribute__=no
--fi
++ac_cv_header_stdc=no
+ fi
 -rm -f conftest.$ac_objext conftest.$ac_ext
-+ac_cv_header_stdc=no
- fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--if test "$ac_cv___attribute__" = "yes"; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE___ATTRIBUTE__ 1
++
 +if test $ac_cv_header_stdc = yes; then
 +  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
- _ACEOF
++_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +#include <string.h>
- 
++
 +_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "memchr" >/dev/null 2>&1; then
@@ -1258,46 +1271,21 @@
 +else
 +  ac_cv_header_stdc=no
  fi
--echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
--echo "${ECHO_T}$ac_cv___attribute__" >&6
--
 +rm -f conftest*
  
--echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
--echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
--if test "${ac_cv_fpic+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
+-if test "$ac_cv___attribute__" = "yes"; then
 +fi
- 
--save_CFLAGS=$CFLAGS
--CFLAGS="${CFLAGS} -fPIC"
--cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++
 +if test $ac_cv_header_stdc = yes; then
 +  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 +  cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
- #include <stdlib.h>
- 
--int
--main ()
--{
--
--static void
--foo(void)
--{
--  exit(1);
--}
--
--  ;
--  return 0;
--}
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++
 +_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "free" >/dev/null 2>&1; then
@@ -1371,15 +1359,21 @@
 +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 +echo "${ECHO_T}$ac_cv_header_stdc" >&6
 +if test $ac_cv_header_stdc = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define HAVE___ATTRIBUTE__ 1
 +#define STDC_HEADERS 1
-+_ACEOF
-+
-+fi
-+
+ _ACEOF
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
+-echo "${ECHO_T}$ac_cv___attribute__" >&6
+ 
 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+
+ 
+-echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
+-echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
+-if test "${ac_cv_fpic+set}" = set; then
 +
 +
 +
@@ -1395,8 +1389,8 @@
 +echo "$as_me:$LINENO: checking for $ac_header" >&5
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 +if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -1404,7 +1398,11 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
-+
+ 
+-save_CFLAGS=$CFLAGS
+-CFLAGS="${CFLAGS} -fPIC"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
 +#include <$ac_header>
 +_ACEOF
 +rm -f conftest.$ac_objext
@@ -1455,11 +1453,11 @@
 +  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.  */
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
 +$ac_includes_default
 +int
 +main ()
@@ -1497,14 +1495,15 @@
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-#include <stdlib.h>
 +ac_cv_type_long_long_int=no
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
 +echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
-+
+ 
 +echo "$as_me:$LINENO: checking size of long long int" >&5
 +echo $ECHO_N "checking size of long long int... $ECHO_C" >&6
 +if test "${ac_cv_sizeof_long_long_int+set}" = set; then
@@ -1524,12 +1523,14 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
-+int
-+main ()
-+{
+ int
+ main ()
+ {
 +static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= 0)];
 +test_array [0] = 0
-+
+ 
+-static void
+-foo(void)
 +  ;
 +  return 0;
 +}
@@ -1566,13 +1567,14 @@
 +$ac_includes_default
 +int
 +main ()
-+{
+ {
+-  exit(1);
 +static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)];
 +test_array [0] = 0
 +
 +  ;
 +  return 0;
-+}
+ }
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -1625,21 +1627,22 @@
 +{
 +static int test_array [1 - 2 * !(((long) (sizeof (long long int))) < 0)];
 +test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
+ 
+   ;
+   return 0;
+@@ -3264,148 +3712,509 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
+   ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
 +	 { 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
@@ -1647,11 +1650,12 @@
 +  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
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_fpic=yes
 +  ac_hi=-1 ac_mid=-1
 +  while :; do
 +    cat >conftest.$ac_ext <<_ACEOF
@@ -1693,25 +1697,28 @@
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_lo=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_fpic=no
 +ac_hi=`expr '(' $ac_mid ')' - 1`
 +		       if test $ac_mid -le $ac_hi; then
 +			 ac_lo= ac_hi=
 +			 break
 +		       fi
 +		       ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-CFLAGS=$save_CFLAGS
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +  done
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
 +ac_lo= ac_hi=
-+fi
+ fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -1730,7 +1737,9 @@
 +{
 +static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)];
 +test_array [0] = 0
-+
+ 
+-if test "$ac_cv_fpic" = "yes"; then
+-    FPIC_CFLAGS="-fPIC"
 +  ;
 +  return 0;
 +}
@@ -1757,12 +1766,15 @@
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_hi=$ac_mid
-+else
+ else
+-    FPIC_CFLAGS=""
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
+-echo "${ECHO_T}$ac_cv_fpic" >&6
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +done
 +case $ac_lo in
@@ -1793,7 +1805,7 @@
 +int
 +main ()
 +{
-+
+ 
 +  FILE *f = fopen ("conftest.val", "w");
 +  if (! f)
 +    exit (1);
@@ -1812,7 +1824,7 @@
 +      fprintf (f, "%lu\n", i);
 +    }
 +  exit (ferror (f) || fclose (f) != 0);
-+
+ 
 +  ;
 +  return 0;
 +}
@@ -1833,7 +1845,11 @@
 +  echo "$as_me: program exited with status $ac_status" >&5
 +echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-   # CMU GUESS RUNPATH SWITCH
+-  echo "$as_me:$LINENO: checking for runpath switch" >&5
+-echo $ECHO_N "checking for runpath switch... $ECHO_C" >&6
+-if test "${andrew_runpath_switch+set}" = set; then
 +( exit $ac_status )
 +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
 +See \`config.log' for more details." >&5
@@ -1859,8 +1875,8 @@
 +echo "$as_me:$LINENO: checking for unsigned long long int" >&5
 +echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6
 +if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -1904,7 +1920,12 @@
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-    # first, try -R
+-    SAVE_LDFLAGS="${LDFLAGS}"
+-    LDFLAGS="-R /usr/lib"
+-    cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
 +ac_cv_type_unsigned_long_long_int=no
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -1925,18 +1946,18 @@
 +  if test "$cross_compiling" = yes; then
 +  # Depending upon the size, compute the lo and hi bounds.
 +cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
+ /* 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 (unsigned long long int))) >= 0)];
 +test_array [0] = 0
-+
+ 
 +  ;
 +  return 0;
 +}
@@ -1971,12 +1992,76 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
+ int
+ main ()
+ {
++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)];
++test_array [0] = 0
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++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 -s conftest$ac_exeext'
++	 { 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
+-  andrew_runpath_switch="-R"
++  ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-  	LDFLAGS="-Wl,-rpath,/usr/lib"
+-    cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
++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 (unsigned long long int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) < 0)];
 +test_array [0] = 0
-+
+ 
 +  ;
 +  return 0;
 +}
@@ -1984,13 +2069,12 @@
 +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 -s conftest.$ac_objext'
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.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
@@ -1998,102 +2082,20 @@
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_fpic=yes
-+  ac_hi=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_fpic=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--CFLAGS=$save_CFLAGS
--
-+ac_lo=`expr $ac_mid + 1`
-+		    if test $ac_lo -le $ac_mid; then
-+		      ac_lo= ac_hi=
-+		      break
-+		    fi
-+		    ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--
--if test "$ac_cv_fpic" = "yes"; then
--    FPIC_CFLAGS="-fPIC"
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
- else
--    FPIC_CFLAGS=""
--fi
--echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
--echo "${ECHO_T}$ac_cv_fpic" >&6
--
--
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
- 
--   # CMU GUESS RUNPATH SWITCH
--  echo "$as_me:$LINENO: checking for runpath switch" >&5
--echo $ECHO_N "checking for runpath switch... $ECHO_C" >&6
--if test "${andrew_runpath_switch+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+cat >conftest.$ac_ext <<_ACEOF
++  { (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
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) < 0)];
-+test_array [0] = 0
- 
--    # first, try -R
--    SAVE_LDFLAGS="${LDFLAGS}"
--    LDFLAGS="-R /usr/lib"
-+  ;
-+  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
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
-+$ac_includes_default
  int
  main ()
  {
@@ -2129,42 +2131,57 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  andrew_runpath_switch="-R"
+-  andrew_runpath_switch="-Wl,-rpath,"
 +  ac_lo=$ac_mid; break
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
+-andrew_runpath_switch="none"
 +ac_hi=`expr '(' $ac_mid ')' - 1`
 +		       if test $ac_mid -le $ac_hi; then
 +			 ac_lo= ac_hi=
 +			 break
 +		       fi
 +		       ac_mid=`expr 2 '*' $ac_mid`
-+fi
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +  done
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
--  	LDFLAGS="-Wl,-rpath,/usr/lib"
--    cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
 +ac_lo= ac_hi=
-+fi
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-  LDFLAGS="${SAVE_LDFLAGS}"
+-
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
+-echo "${ECHO_T}$andrew_runpath_switch" >&6
+-
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
+-if test "${ac_cv_header_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +# Binary search between lo and hi bounds.
 +while test "x$ac_lo" != "x$ac_hi"; do
 +  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
 -
 +$ac_includes_default
  int
@@ -2175,13 +2192,11 @@
  
    ;
    return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -3413,103 +4222,313 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
 +  (eval $ac_compile) 2>conftest.er1
    ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
@@ -2189,7 +2204,7 @@
 +  cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
+-         { ac_try='test -s conftest.$ac_objext'
 +	 { 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
@@ -2202,16 +2217,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
--  andrew_runpath_switch="-Wl,-rpath,"
+-  ac_cv_header_stdc=yes
 +  ac_hi=$ac_mid
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--andrew_runpath_switch="none"
+-ac_cv_header_stdc=no
 +ac_lo=`expr '(' $ac_mid ')' + 1`
  fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +done
 +case $ac_lo in
@@ -2228,12 +2246,14 @@
 +echo "$as_me: error: internal error: not reached in cross-compile" >&2;}
 +   { (exit 1); exit 1; }; }
 +else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <string.h>
 +$ac_includes_default
 +long longval () { return (long) (sizeof (unsigned long long int)); }
 +unsigned long ulongval () { return (long) (sizeof (unsigned long long int)); }
@@ -2242,10 +2262,7 @@
 +int
 +main ()
 +{
- 
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--  LDFLAGS="${SAVE_LDFLAGS}"
++
 +  FILE *f = fopen ("conftest.val", "w");
 +  if (! f)
 +    exit (1);
@@ -2264,11 +2281,14 @@
 +      fprintf (f, "%lu\n", i);
 +    }
 +  exit (ferror (f) || fclose (f) != 0);
-+
+ 
 +  ;
 +  return 0;
 +}
-+_ACEOF
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then
+-  :
 +rm -f conftest$ac_exeext
 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
@@ -2281,7 +2301,10 @@
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +  ac_cv_sizeof_unsigned_long_long_int=`cat conftest.val`
-+else
+ else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
 +  echo "$as_me: program exited with status $ac_status" >&5
 +echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
@@ -2301,17 +2324,16 @@
 +  ac_cv_sizeof_unsigned_long_long_int=0
 +fi
  fi
--echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
--echo "${ECHO_T}$andrew_runpath_switch" >&6
 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long_int" >&6
 +cat >>confdefs.h <<_ACEOF
 +#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
 +_ACEOF
  
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
--if test "${ac_cv_header_stdc+set}" = set; then
+-if test $ac_cv_header_stdc = yes; then
+-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
 +
 +if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
 +        "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
@@ -2323,10 +2345,8 @@
 +  echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 +if test "${ac_cv_c_bigendian+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  # See if sys/param.h defines the BYTE_ORDER macro.
 +cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
@@ -2335,34 +2355,32 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
 -#include <stdlib.h>
--#include <stdarg.h>
--#include <string.h>
--#include <float.h>
 +#include <sys/types.h>
 +#include <sys/param.h>
  
- int
- main ()
- {
++int
++main ()
++{
 +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
 + bogus endian macros
 +#endif
- 
-   ;
-   return 0;
-@@ -3413,103 +4375,159 @@
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>&5
++
++  ;
++  return 0;
++}
+ _ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then
+-  :
++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 -s conftest.$ac_objext'
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.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
@@ -2370,32 +2388,18 @@
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; } &&
 +	 { ac_try='test -s conftest.$ac_objext'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_header_stdc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_header_stdc=no
--fi
--rm -f conftest.$ac_objext conftest.$ac_ext
--
--if test $ac_cv_header_stdc = yes; then
--  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
++  { (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
 +  # It does; now see whether it defined to BIG_ENDIAN or not.
 +cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <string.h>
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
 +#include <sys/types.h>
 +#include <sys/param.h>
 +
@@ -2405,14 +2409,11 @@
 +#if BYTE_ORDER != BIG_ENDIAN
 + not big endian
 +#endif
- 
++
 +  ;
 +  return 0;
 +}
- _ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then
--  :
++_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
@@ -2437,33 +2438,27 @@
 +  ac_cv_c_bigendian=yes
  else
 -  ac_cv_header_stdc=no
--fi
--rm -f conftest*
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
++
 +ac_cv_c_bigendian=no
  fi
+-rm -f conftest*
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
--if test $ac_cv_header_stdc = yes; then
--  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 +# It does not; compile a test program.
 +if test "$cross_compiling" = yes; then
 +  # try to guess the endianness by grepping values into an object file
 +  ac_cv_c_bigendian=unknown
-   cat >conftest.$ac_ext <<_ACEOF
--#line $LINENO "configure"
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <stdlib.h>
--
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
 +short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
 +short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
@@ -2477,12 +2472,7 @@
 +  ;
 +  return 0;
 +}
- _ACEOF
--if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then
--  :
--else
--  ac_cv_header_stdc=no
++_ACEOF
 +rm -f conftest.$ac_objext
 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>conftest.er1
@@ -2506,7 +2496,7 @@
 +  (exit $ac_status); }; }; then
 +  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
 +  ac_cv_c_bigendian=yes
-+fi
+ fi
 +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
 +  if test "$ac_cv_c_bigendian" = unknown; then
 +    ac_cv_c_bigendian=no
@@ -2514,18 +2504,16 @@
 +    # finding both strings is unlikely to happen, but who knows?
 +    ac_cv_c_bigendian=unknown
 +  fi
- fi
--rm -f conftest*
++fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
  
- fi
--
 -if test $ac_cv_header_stdc = yes; then
 -  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 -  if test "$cross_compiling" = yes; then
 -  :
++fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -2568,7 +2556,7 @@
  }
  _ACEOF
  rm -f conftest$ac_exeext
-@@ -3523,90 +4541,191 @@
+@@ -3523,90 +4542,191 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -2621,20 +2609,20 @@
 +if test "${ac_cv___attribute__+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+
+ 
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
 +#include <stdlib.h>
-+
+ 
 +int
 +main ()
 +{
-+
+ 
 +static void foo(void) __attribute__ ((noreturn));
  
 +static void
@@ -2672,22 +2660,13 @@
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
++
 +ac_cv___attribute__=no
 +fi
 +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
  
 +if test "$ac_cv___attribute__" = "yes"; then
- 
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE___ATTRIBUTE__ 1
-+_ACEOF
- 
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
-+echo "${ECHO_T}$ac_cv___attribute__" >&6
- 
  
 -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 -                  inttypes.h stdint.h unistd.h
@@ -2696,6 +2675,15 @@
 -echo "$as_me:$LINENO: checking for $ac_header" >&5
 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 -if eval "test \"\${$as_ac_Header+set}\" = set"; then
++cat >>confdefs.h <<\_ACEOF
++#define HAVE___ATTRIBUTE__ 1
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
++echo "${ECHO_T}$ac_cv___attribute__" >&6
++
++
 +echo "$as_me:$LINENO: checking if compiler supports -fPIC" >&5
 +echo $ECHO_N "checking if compiler supports -fPIC... $ECHO_C" >&6
 +if test "${ac_cv_fpic+set}" = set; then
@@ -2791,7 +2779,7 @@
  
  
  
-@@ -3629,7 +4748,6 @@
+@@ -3629,7 +4749,6 @@
  echo "$as_me:$LINENO: checking $ac_header usability" >&5
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -2799,7 +2787,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3640,11 +4758,20 @@
+@@ -3640,11 +4759,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -2822,7 +2810,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3657,7 +4784,7 @@
+@@ -3657,7 +4785,7 @@
  
  ac_header_compiler=no
  fi
@@ -2831,7 +2819,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -3665,7 +4792,6 @@
+@@ -3665,7 +4793,6 @@
  echo "$as_me:$LINENO: checking $ac_header presence" >&5
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -2839,7 +2827,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3683,6 +4809,7 @@
+@@ -3683,6 +4810,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2847,7 +2835,7 @@
    else
      ac_cpp_err=
    fi
-@@ -3702,33 +4829,32 @@
+@@ -3702,33 +4830,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -2898,7 +2886,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -3739,7 +4865,7 @@
+@@ -3739,7 +4866,7 @@
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -2907,7 +2895,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -3767,21 +4893,28 @@
+@@ -3767,21 +4894,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -2937,7 +2925,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -3812,11 +4945,20 @@
+@@ -3812,11 +4946,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -2960,7 +2948,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3829,7 +4971,8 @@
+@@ -3829,7 +4972,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -2970,7 +2958,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -3839,7 +4982,14 @@
+@@ -3839,7 +4983,14 @@
  _ACEOF
  
  else
@@ -2986,7 +2974,7 @@
  fi
  done
  
-@@ -3855,21 +5005,28 @@
+@@ -3855,21 +5006,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3016,7 +3004,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -3900,11 +5057,20 @@
+@@ -3900,11 +5058,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3039,7 +3027,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3917,7 +5083,8 @@
+@@ -3917,7 +5084,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -3049,7 +3037,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -3943,7 +5110,6 @@
+@@ -3943,7 +5111,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3057,7 +3045,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3963,11 +5129,20 @@
+@@ -3963,11 +5130,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -3080,7 +3068,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3980,7 +5155,7 @@
+@@ -3980,7 +5156,7 @@
  
  eval "$as_ac_Header=no"
  fi
@@ -3089,7 +3077,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -4003,7 +5178,6 @@
+@@ -4003,7 +5179,6 @@
    ac_func_search_save_LIBS=$LIBS
  ac_cv_search_opendir=no
  cat >conftest.$ac_ext <<_ACEOF
@@ -3097,7 +3085,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4027,11 +5201,20 @@
+@@ -4027,11 +5202,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3120,7 +3108,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4043,12 +5226,12 @@
+@@ -4043,12 +5227,12 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -3135,7 +3123,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4072,11 +5255,20 @@
+@@ -4072,11 +5256,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3158,7 +3146,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4089,7 +5281,8 @@
+@@ -4089,7 +5282,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -3168,7 +3156,7 @@
    done
  fi
  LIBS=$ac_func_search_save_LIBS
-@@ -4110,7 +5303,6 @@
+@@ -4110,7 +5304,6 @@
    ac_func_search_save_LIBS=$LIBS
  ac_cv_search_opendir=no
  cat >conftest.$ac_ext <<_ACEOF
@@ -3176,7 +3164,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4134,11 +5326,20 @@
+@@ -4134,11 +5327,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3199,7 +3187,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4150,12 +5351,12 @@
+@@ -4150,12 +5352,12 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -3214,7 +3202,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4179,11 +5380,20 @@
+@@ -4179,11 +5381,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3237,7 +3225,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4196,7 +5406,8 @@
+@@ -4196,7 +5407,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -3247,7 +3235,7 @@
    done
  fi
  LIBS=$ac_func_search_save_LIBS
-@@ -4220,21 +5431,28 @@
+@@ -4220,21 +5432,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3277,7 +3265,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -4265,11 +5483,20 @@
+@@ -4265,11 +5484,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3300,7 +3288,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4282,7 +5509,8 @@
+@@ -4282,7 +5510,8 @@
  
  ac_cv_func_connect=no
  fi
@@ -3310,7 +3298,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
  echo "${ECHO_T}$ac_cv_func_connect" >&6
-@@ -4297,7 +5525,6 @@
+@@ -4297,7 +5526,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -3318,7 +3306,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4321,11 +5548,20 @@
+@@ -4321,11 +5549,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3341,7 +3329,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4338,7 +5574,8 @@
+@@ -4338,7 +5575,8 @@
  
  ac_cv_lib_nsl_gethostbyname=no
  fi
@@ -3351,7 +3339,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-@@ -4355,7 +5592,6 @@
+@@ -4355,7 +5593,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -3359,7 +3347,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4379,11 +5615,20 @@
+@@ -4379,11 +5616,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3382,7 +3370,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4396,7 +5641,8 @@
+@@ -4396,7 +5642,8 @@
  
  ac_cv_lib_socket_connect=no
  fi
@@ -3392,7 +3380,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-@@ -4415,21 +5661,28 @@
+@@ -4415,21 +5662,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3422,7 +3410,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -4460,11 +5713,20 @@
+@@ -4460,11 +5714,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3445,7 +3433,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4477,7 +5739,8 @@
+@@ -4477,7 +5740,8 @@
  
  ac_cv_func_res_search=no
  fi
@@ -3455,7 +3443,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
  echo "${ECHO_T}$ac_cv_func_res_search" >&6
-@@ -4492,7 +5755,6 @@
+@@ -4492,7 +5756,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lresolv  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -3463,7 +3451,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4516,11 +5778,20 @@
+@@ -4516,11 +5779,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3486,7 +3474,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4533,7 +5804,8 @@
+@@ -4533,7 +5805,8 @@
  
  ac_cv_lib_resolv_res_search=no
  fi
@@ -3496,7 +3484,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
-@@ -4557,21 +5829,28 @@
+@@ -4557,21 +5830,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3526,7 +3514,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -4602,11 +5881,20 @@
+@@ -4602,11 +5882,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3549,7 +3537,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4619,7 +5907,8 @@
+@@ -4619,7 +5908,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -3559,7 +3547,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -4644,21 +5933,28 @@
+@@ -4644,21 +5934,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3589,7 +3577,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -4689,11 +5985,20 @@
+@@ -4689,11 +5986,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3612,7 +3600,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4706,7 +6011,8 @@
+@@ -4706,7 +6012,8 @@
  
  ac_cv_func_getaddrinfo=no
  fi
@@ -3622,7 +3610,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
  echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
-@@ -4723,7 +6029,6 @@
+@@ -4723,7 +6030,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -3630,7 +3618,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4747,11 +6052,20 @@
+@@ -4747,11 +6053,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3653,7 +3641,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4764,7 +6078,8 @@
+@@ -4764,7 +6079,8 @@
  
  ac_cv_lib_socket_getaddrinfo=no
  fi
@@ -3663,7 +3651,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5
-@@ -4803,7 +6118,6 @@
+@@ -4803,7 +6119,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-linet6  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -3671,7 +3659,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4827,11 +6141,20 @@
+@@ -4827,11 +6142,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3694,7 +3682,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4844,7 +6167,8 @@
+@@ -4844,7 +6168,8 @@
  
  ac_cv_lib_inet6_getaddrinfo=no
  fi
@@ -3704,7 +3692,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5
-@@ -4872,7 +6196,6 @@
+@@ -4872,7 +6197,6 @@
    if test getaddrinfo = getaddrinfo; then
      for ipv6_cv_pfx in o n; do
        cat >conftest.$ac_ext <<_ACEOF
@@ -3712,7 +3700,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -4890,21 +6213,28 @@
+@@ -4890,21 +6214,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3742,7 +3730,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -4935,11 +6265,20 @@
+@@ -4935,11 +6266,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3765,7 +3753,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4952,7 +6291,8 @@
+@@ -4952,7 +6292,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -3775,7 +3763,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -4980,21 +6320,28 @@
+@@ -4980,21 +6321,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3805,7 +3793,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -5025,11 +6372,20 @@
+@@ -5025,11 +6373,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3828,7 +3816,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5042,7 +6398,8 @@
+@@ -5042,7 +6399,8 @@
  
  ac_cv_func_gai_strerror=no
  fi
@@ -3838,7 +3826,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_gai_strerror" >&5
  echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6
-@@ -5059,7 +6416,6 @@
+@@ -5059,7 +6417,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -3846,7 +3834,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5083,11 +6439,20 @@
+@@ -5083,11 +6440,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3869,7 +3857,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5100,7 +6465,8 @@
+@@ -5100,7 +6466,8 @@
  
  ac_cv_lib_socket_gai_strerror=no
  fi
@@ -3879,7 +3867,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gai_strerror" >&5
-@@ -5139,7 +6505,6 @@
+@@ -5139,7 +6506,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-linet6  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -3887,7 +3875,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5163,11 +6528,20 @@
+@@ -5163,11 +6529,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3910,7 +3898,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5180,7 +6554,8 @@
+@@ -5180,7 +6555,8 @@
  
  ac_cv_lib_inet6_gai_strerror=no
  fi
@@ -3920,7 +3908,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_gai_strerror" >&5
-@@ -5208,7 +6583,6 @@
+@@ -5208,7 +6584,6 @@
    if test gai_strerror = getaddrinfo; then
      for ipv6_cv_pfx in o n; do
        cat >conftest.$ac_ext <<_ACEOF
@@ -3928,7 +3916,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5226,21 +6600,28 @@
+@@ -5226,21 +6601,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -3958,7 +3946,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -5271,11 +6652,20 @@
+@@ -5271,11 +6653,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -3981,7 +3969,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5288,7 +6678,8 @@
+@@ -5288,7 +6679,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -3991,7 +3979,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -5333,21 +6724,28 @@
+@@ -5333,21 +6725,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4021,7 +4009,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -5378,11 +6776,20 @@
+@@ -5378,11 +6777,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4044,7 +4032,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5395,7 +6802,8 @@
+@@ -5395,7 +6803,8 @@
  
  ac_cv_func_getnameinfo=no
  fi
@@ -4054,7 +4042,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo" >&5
  echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6
-@@ -5412,7 +6820,6 @@
+@@ -5412,7 +6821,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -4062,7 +4050,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5436,11 +6843,20 @@
+@@ -5436,11 +6844,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4085,7 +4073,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5453,7 +6869,8 @@
+@@ -5453,7 +6870,8 @@
  
  ac_cv_lib_socket_getnameinfo=no
  fi
@@ -4095,7 +4083,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getnameinfo" >&5
-@@ -5492,7 +6909,6 @@
+@@ -5492,7 +6910,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-linet6  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -4103,7 +4091,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5516,11 +6932,20 @@
+@@ -5516,11 +6933,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4126,7 +4114,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5533,7 +6958,8 @@
+@@ -5533,7 +6959,8 @@
  
  ac_cv_lib_inet6_getnameinfo=no
  fi
@@ -4136,7 +4124,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getnameinfo" >&5
-@@ -5561,7 +6987,6 @@
+@@ -5561,7 +6988,6 @@
    if test getnameinfo = getaddrinfo; then
      for ipv6_cv_pfx in o n; do
        cat >conftest.$ac_ext <<_ACEOF
@@ -4144,7 +4132,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5579,21 +7004,28 @@
+@@ -5579,21 +7005,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4174,7 +4162,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -5624,11 +7056,20 @@
+@@ -5624,11 +7057,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4197,7 +4185,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5641,7 +7082,8 @@
+@@ -5641,7 +7083,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -4207,7 +4195,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -5682,7 +7124,6 @@
+@@ -5682,7 +7125,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4215,7 +4203,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5700,11 +7141,20 @@
+@@ -5700,11 +7142,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4238,7 +4226,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5717,7 +7167,7 @@
+@@ -5717,7 +7168,7 @@
  
  ipv6_cv_ss_family=no
  fi
@@ -4247,7 +4235,7 @@
  fi
  if test $ipv6_cv_ss_family = yes; then
  
-@@ -5737,7 +7187,6 @@
+@@ -5737,7 +7188,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4255,7 +4243,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5755,11 +7204,20 @@
+@@ -5755,11 +7205,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4278,7 +4266,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5772,7 +7230,7 @@
+@@ -5772,7 +7231,7 @@
  
  ipv6_cv_sa_len=no
  fi
@@ -4287,7 +4275,7 @@
  fi
  if test $ipv6_cv_sa_len = yes; then
  
-@@ -5805,7 +7263,6 @@
+@@ -5805,7 +7264,6 @@
  echo "$as_me:$LINENO: checking $ac_header usability" >&5
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -4295,7 +4283,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5816,11 +7273,20 @@
+@@ -5816,11 +7274,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4318,7 +4306,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5833,7 +7299,7 @@
+@@ -5833,7 +7300,7 @@
  
  ac_header_compiler=no
  fi
@@ -4327,7 +4315,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -5841,7 +7307,6 @@
+@@ -5841,7 +7308,6 @@
  echo "$as_me:$LINENO: checking $ac_header presence" >&5
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -4335,7 +4323,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5859,6 +7324,7 @@
+@@ -5859,6 +7325,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4343,7 +4331,7 @@
    else
      ac_cpp_err=
    fi
-@@ -5878,33 +7344,32 @@
+@@ -5878,33 +7345,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -4394,7 +4382,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -5915,7 +7380,7 @@
+@@ -5915,7 +7381,7 @@
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -4403,7 +4391,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -5936,7 +7401,6 @@
+@@ -5936,7 +7402,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4411,7 +4399,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5957,11 +7421,20 @@
+@@ -5957,11 +7422,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4434,7 +4422,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5974,7 +7447,7 @@
+@@ -5974,7 +7448,7 @@
  
  ac_cv_header_time=no
  fi
@@ -4443,7 +4431,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
  echo "${ECHO_T}$ac_cv_header_time" >&6
-@@ -5992,7 +7465,6 @@
+@@ -5992,7 +7466,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4451,7 +4439,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6011,11 +7483,20 @@
+@@ -6011,11 +7484,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4474,7 +4462,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6028,7 +7509,7 @@
+@@ -6028,7 +7510,7 @@
  
  ac_cv_struct_tm=sys/time.h
  fi
@@ -4483,7 +4471,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
  echo "${ECHO_T}$ac_cv_struct_tm" >&6
-@@ -6046,7 +7527,6 @@
+@@ -6046,7 +7528,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4491,7 +4479,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6068,11 +7548,20 @@
+@@ -6068,11 +7549,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4514,7 +4502,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6084,7 +7573,6 @@
+@@ -6084,7 +7574,6 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  cat >conftest.$ac_ext <<_ACEOF
@@ -4522,7 +4510,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6106,11 +7594,20 @@
+@@ -6106,11 +7595,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4545,7 +4533,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6123,9 +7620,9 @@
+@@ -6123,9 +7621,9 @@
  
  ac_cv_member_struct_tm_tm_zone=no
  fi
@@ -4557,7 +4545,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
  echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
-@@ -6151,7 +7648,6 @@
+@@ -6151,7 +7649,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4565,7 +4553,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6172,11 +7668,20 @@
+@@ -6172,11 +7669,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4588,7 +4576,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6189,7 +7694,8 @@
+@@ -6189,7 +7695,8 @@
  
  ac_cv_var_tzname=no
  fi
@@ -4598,7 +4586,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
  echo "${ECHO_T}$ac_cv_var_tzname" >&6
-@@ -6218,21 +7724,28 @@
+@@ -6218,21 +7725,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4628,7 +4616,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -6263,11 +7776,20 @@
+@@ -6263,11 +7777,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4651,7 +4639,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6280,7 +7802,8 @@
+@@ -6280,7 +7803,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -4661,7 +4649,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -6295,21 +7818,28 @@
+@@ -6295,21 +7819,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -4691,7 +4679,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -6340,11 +7870,20 @@
+@@ -6340,11 +7871,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4714,7 +4702,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6357,7 +7896,8 @@
+@@ -6357,7 +7897,8 @@
  
  ac_cv_func__doprnt=no
  fi
@@ -4724,7 +4712,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
  echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-@@ -6470,7 +8010,6 @@
+@@ -6470,7 +8011,6 @@
  echo "$as_me:$LINENO: checking db.h usability" >&5
  echo $ECHO_N "checking db.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -4732,7 +4720,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6481,11 +8020,20 @@
+@@ -6481,11 +8021,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -4755,7 +4743,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6498,7 +8046,7 @@
+@@ -6498,7 +8047,7 @@
  
  ac_header_compiler=no
  fi
@@ -4764,7 +4752,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -6506,7 +8054,6 @@
+@@ -6506,7 +8055,6 @@
  echo "$as_me:$LINENO: checking db.h presence" >&5
  echo $ECHO_N "checking db.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -4772,7 +4760,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6524,6 +8071,7 @@
+@@ -6524,6 +8072,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4780,7 +4768,7 @@
    else
      ac_cpp_err=
    fi
-@@ -6543,33 +8091,32 @@
+@@ -6543,33 +8092,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -4831,7 +4819,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -6616,7 +8163,6 @@
+@@ -6616,7 +8164,6 @@
            do
  	    LIBS="$saved_LIBS -l$dbname"
  	    cat >conftest.$ac_ext <<_ACEOF
@@ -4839,7 +4827,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6633,11 +8179,20 @@
+@@ -6633,11 +8180,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4862,7 +4850,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6650,13 +8205,13 @@
+@@ -6650,13 +8206,13 @@
  
  dblib="no"
  fi
@@ -4878,7 +4866,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6673,11 +8228,20 @@
+@@ -6673,11 +8229,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4901,7 +4889,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6690,7 +8254,8 @@
+@@ -6690,7 +8255,8 @@
  
  dblib="no"
  fi
@@ -4911,7 +4899,7 @@
          fi
  	LIBS=$saved_LIBS
  
-@@ -6858,7 +8423,6 @@
+@@ -6858,7 +8424,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lfl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -4919,7 +4907,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6882,11 +8446,20 @@
+@@ -6882,11 +8447,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4942,7 +4930,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6899,7 +8472,8 @@
+@@ -6899,7 +8473,8 @@
  
  ac_cv_lib_fl_yywrap=no
  fi
@@ -4952,7 +4940,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
-@@ -6915,7 +8489,6 @@
+@@ -6915,7 +8490,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ll  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -4960,7 +4948,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -6939,11 +8512,20 @@
+@@ -6939,11 +8513,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -4983,7 +4971,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6956,7 +8538,8 @@
+@@ -6956,7 +8539,8 @@
  
  ac_cv_lib_l_yywrap=no
  fi
@@ -4993,7 +4981,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
-@@ -7018,11 +8601,20 @@
+@@ -7018,11 +8602,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5016,7 +5004,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7034,7 +8626,8 @@
+@@ -7034,7 +8627,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -5026,7 +5014,7 @@
  LIBS=$ac_save_LIBS
  rm -f "${LEX_OUTPUT_ROOT}.c"
  
-@@ -7059,7 +8652,6 @@
+@@ -7059,7 +8653,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lfl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -5034,7 +5022,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7077,11 +8669,20 @@
+@@ -7077,11 +8670,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5057,7 +5045,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7094,7 +8695,8 @@
+@@ -7094,7 +8696,8 @@
  
  ac_cv_lib_fl_main=no
  fi
@@ -5067,7 +5055,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_fl_main" >&5
-@@ -7117,7 +8719,6 @@
+@@ -7117,7 +8720,6 @@
    ac_func_search_save_LIBS=$LIBS
  ac_cv_search_regcomp=no
  cat >conftest.$ac_ext <<_ACEOF
@@ -5075,7 +5063,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7141,11 +8742,20 @@
+@@ -7141,11 +8743,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5098,7 +5086,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7157,12 +8767,12 @@
+@@ -7157,12 +8768,12 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -5113,7 +5101,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7186,11 +8796,20 @@
+@@ -7186,11 +8797,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5136,7 +5124,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7203,7 +8822,8 @@
+@@ -7203,7 +8823,8 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -5146,7 +5134,7 @@
    done
  fi
  LIBS=$ac_func_search_save_LIBS
-@@ -7231,7 +8851,6 @@
+@@ -7231,7 +8852,6 @@
  echo "$as_me:$LINENO: checking rxposix.h usability" >&5
  echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -5154,7 +5142,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7242,11 +8861,20 @@
+@@ -7242,11 +8862,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5177,7 +5165,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7259,7 +8887,7 @@
+@@ -7259,7 +8888,7 @@
  
  ac_header_compiler=no
  fi
@@ -5186,7 +5174,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -7267,7 +8895,6 @@
+@@ -7267,7 +8896,6 @@
  echo "$as_me:$LINENO: checking rxposix.h presence" >&5
  echo $ECHO_N "checking rxposix.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -5194,7 +5182,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7285,6 +8912,7 @@
+@@ -7285,6 +8913,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5202,7 +5190,7 @@
    else
      ac_cpp_err=
    fi
-@@ -7304,33 +8932,32 @@
+@@ -7304,33 +8933,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -5253,7 +5241,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -7372,21 +8999,28 @@
+@@ -7372,21 +9000,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -5283,7 +5271,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -7417,11 +9051,20 @@
+@@ -7417,11 +9052,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5306,7 +5294,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7434,7 +9077,8 @@
+@@ -7434,7 +9078,8 @@
  
  ac_cv_func_strerror=no
  fi
@@ -5316,7 +5304,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5
  echo "${ECHO_T}$ac_cv_func_strerror" >&6
-@@ -7470,7 +9114,6 @@
+@@ -7470,7 +9115,6 @@
  echo "$as_me:$LINENO: checking $ac_header usability" >&5
  echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -5324,7 +5312,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7481,11 +9124,20 @@
+@@ -7481,11 +9125,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5347,7 +5335,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7498,7 +9150,7 @@
+@@ -7498,7 +9151,7 @@
  
  ac_header_compiler=no
  fi
@@ -5356,7 +5344,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -7506,7 +9158,6 @@
+@@ -7506,7 +9159,6 @@
  echo "$as_me:$LINENO: checking $ac_header presence" >&5
  echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -5364,7 +5352,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7524,6 +9175,7 @@
+@@ -7524,6 +9176,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5372,7 +5360,7 @@
    else
      ac_cpp_err=
    fi
-@@ -7543,33 +9195,32 @@
+@@ -7543,33 +9196,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -5423,7 +5411,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -7580,7 +9231,7 @@
+@@ -7580,7 +9232,7 @@
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -5432,7 +5420,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-@@ -7605,21 +9256,28 @@
+@@ -7605,21 +9257,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -5462,7 +5450,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -7650,11 +9308,20 @@
+@@ -7650,11 +9309,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5485,7 +5473,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7667,7 +9334,8 @@
+@@ -7667,7 +9335,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -5495,7 +5483,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -7689,21 +9357,28 @@
+@@ -7689,21 +9358,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -5525,7 +5513,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -7734,11 +9409,20 @@
+@@ -7734,11 +9410,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5548,7 +5536,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7751,7 +9435,8 @@
+@@ -7751,7 +9436,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -5558,7 +5546,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -7775,21 +9460,28 @@
+@@ -7775,21 +9461,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -5588,7 +5576,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -7820,11 +9512,20 @@
+@@ -7820,11 +9513,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5611,7 +5599,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7837,7 +9538,8 @@
+@@ -7837,7 +9539,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -5621,7 +5609,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -7860,21 +9562,28 @@
+@@ -7860,21 +9563,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -5651,7 +5639,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -7905,11 +9614,20 @@
+@@ -7905,11 +9615,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5674,7 +5662,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7922,7 +9640,8 @@
+@@ -7922,7 +9641,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -5684,7 +5672,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -7936,7 +9655,6 @@
+@@ -7936,7 +9656,6 @@
  
  
  cat >conftest.$ac_ext <<_ACEOF
@@ -5692,7 +5680,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7956,7 +9674,6 @@
+@@ -7956,7 +9675,6 @@
  rm -f conftest*
  
  cat >conftest.$ac_ext <<_ACEOF
@@ -5700,7 +5688,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -7976,7 +9693,6 @@
+@@ -7976,7 +9694,6 @@
  rm -f conftest*
  
  cat >conftest.$ac_ext <<_ACEOF
@@ -5708,7 +5696,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8003,21 +9719,28 @@
+@@ -8003,21 +9720,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -5738,7 +5726,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -8048,11 +9771,20 @@
+@@ -8048,11 +9772,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5761,7 +5749,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8065,7 +9797,8 @@
+@@ -8065,7 +9798,8 @@
  
  ac_cv_func_setproctitle=no
  fi
@@ -5771,7 +5759,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5
  echo "${ECHO_T}$ac_cv_func_setproctitle" >&6
-@@ -8082,7 +9815,6 @@
+@@ -8082,7 +9816,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lutil  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -5779,7 +5767,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8106,11 +9838,20 @@
+@@ -8106,11 +9839,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -5802,7 +5790,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8123,7 +9864,8 @@
+@@ -8123,7 +9865,8 @@
  
  ac_cv_lib_util_setproctitle=no
  fi
@@ -5812,7 +5800,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
-@@ -8148,7 +9890,6 @@
+@@ -8148,7 +9891,6 @@
  echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5
  echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -5820,7 +5808,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8159,11 +9900,20 @@
+@@ -8159,11 +9901,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5843,7 +5831,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8176,7 +9926,7 @@
+@@ -8176,7 +9927,7 @@
  
  ac_header_compiler=no
  fi
@@ -5852,7 +5840,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -8184,7 +9934,6 @@
+@@ -8184,7 +9935,6 @@
  echo "$as_me:$LINENO: checking sys/pstat.h presence" >&5
  echo $ECHO_N "checking sys/pstat.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -5860,7 +5848,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8202,6 +9951,7 @@
+@@ -8202,6 +9952,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5868,7 +5856,7 @@
    else
      ac_cpp_err=
    fi
-@@ -8221,33 +9971,32 @@
+@@ -8221,33 +9972,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -5919,7 +5907,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -8284,7 +10033,6 @@
+@@ -8284,7 +10034,6 @@
  echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5
  echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -5927,7 +5915,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8295,11 +10043,20 @@
+@@ -8295,11 +10044,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -5950,7 +5938,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8312,7 +10069,7 @@
+@@ -8312,7 +10070,7 @@
  
  ac_header_compiler=no
  fi
@@ -5959,7 +5947,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -8320,7 +10077,6 @@
+@@ -8320,7 +10078,6 @@
  echo "$as_me:$LINENO: checking sys/sysnews.h presence" >&5
  echo $ECHO_N "checking sys/sysnews.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -5967,7 +5955,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8338,6 +10094,7 @@
+@@ -8338,6 +10095,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5975,7 +5963,7 @@
    else
      ac_cpp_err=
    fi
-@@ -8357,33 +10114,32 @@
+@@ -8357,33 +10115,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -6026,7 +6014,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -8413,7 +10169,6 @@
+@@ -8413,7 +10170,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6034,7 +6022,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8436,6 +10191,7 @@
+@@ -8436,6 +10192,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6042,7 +6030,7 @@
    else
      ac_cpp_err=
    fi
-@@ -8466,7 +10222,6 @@
+@@ -8466,7 +10223,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6050,7 +6038,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8487,6 +10242,7 @@
+@@ -8487,6 +10243,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6058,7 +6046,7 @@
    else
      ac_cpp_err=
    fi
-@@ -8517,7 +10273,6 @@
+@@ -8517,7 +10274,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6066,7 +6054,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8538,6 +10293,7 @@
+@@ -8538,6 +10294,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6074,7 +6062,7 @@
    else
      ac_cpp_err=
    fi
-@@ -8575,7 +10331,6 @@
+@@ -8575,7 +10332,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6082,7 +6070,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8597,11 +10352,20 @@
+@@ -8597,11 +10353,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6105,7 +6093,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8614,7 +10378,8 @@
+@@ -8614,7 +10379,8 @@
  
  cyrus_cv_sys_nonblock=ioctl
  fi
@@ -6115,7 +6103,7 @@
  fi
  
  WITH_NONBLOCK=$cyrus_cv_sys_nonblock
-@@ -8628,7 +10393,6 @@
+@@ -8628,7 +10394,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6123,7 +6111,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8648,11 +10412,20 @@
+@@ -8648,11 +10413,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -6146,7 +6134,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8665,7 +10438,7 @@
+@@ -8665,7 +10439,7 @@
  
  cyrus_cv_struct_sys_gmtoff=gmtime
  fi
@@ -6155,7 +6143,7 @@
  fi
  
  WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
-@@ -8681,7 +10454,6 @@
+@@ -8681,7 +10455,6 @@
    cyrus_cv_func_mmap_shared=no
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6163,7 +6151,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8733,7 +10505,7 @@
+@@ -8733,7 +10506,7 @@
  ( exit $ac_status )
  cyrus_cv_func_mmap_shared=no
  fi
@@ -6172,7 +6160,7 @@
  fi
  fi
  
-@@ -8751,7 +10523,6 @@
+@@ -8751,7 +10524,6 @@
    cyrus_cv_func_mmap_stupidshared=no
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6180,7 +6168,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -8804,7 +10575,7 @@
+@@ -8804,7 +10576,7 @@
  ( exit $ac_status )
  cyrus_cv_func_mmap_stupidshared=no
  fi
@@ -6189,7 +6177,7 @@
  fi
  fi
  
-@@ -8835,21 +10606,28 @@
+@@ -8835,21 +10607,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6219,7 +6207,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -8880,11 +10658,20 @@
+@@ -8880,11 +10659,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6242,7 +6230,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8897,7 +10684,8 @@
+@@ -8897,7 +10685,8 @@
  
  ac_cv_func_fcntl=no
  fi
@@ -6252,7 +6240,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5
  echo "${ECHO_T}$ac_cv_func_fcntl" >&6
-@@ -8911,21 +10699,28 @@
+@@ -8911,21 +10700,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6282,7 +6270,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -8956,11 +10751,20 @@
+@@ -8956,11 +10752,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6305,7 +6293,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8973,7 +10777,8 @@
+@@ -8973,7 +10778,8 @@
  
  ac_cv_func_flock=no
  fi
@@ -6315,7 +6303,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5
  echo "${ECHO_T}$ac_cv_func_flock" >&6
-@@ -9002,21 +10807,28 @@
+@@ -9002,21 +10808,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6345,7 +6333,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -9047,11 +10859,20 @@
+@@ -9047,11 +10860,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6368,7 +6356,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9064,7 +10885,8 @@
+@@ -9064,7 +10886,8 @@
  
  ac_cv_func_fdatasync=no
  fi
@@ -6378,7 +6366,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5
  echo "${ECHO_T}$ac_cv_func_fdatasync" >&6
-@@ -9084,7 +10906,6 @@
+@@ -9084,7 +10907,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lrt  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6386,7 +6374,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9108,11 +10929,20 @@
+@@ -9108,11 +10930,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6409,7 +6397,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9125,7 +10955,8 @@
+@@ -9125,7 +10956,8 @@
  
  ac_cv_lib_rt_fdatasync=no
  fi
@@ -6419,7 +6407,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5
-@@ -9156,21 +10987,28 @@
+@@ -9156,21 +10988,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -6449,7 +6437,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -9201,11 +11039,20 @@
+@@ -9201,11 +11040,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6472,7 +6460,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9218,7 +11065,8 @@
+@@ -9218,7 +11066,8 @@
  
  ac_cv_func_sigvec=no
  fi
@@ -6482,7 +6470,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_sigvec" >&5
  echo "${ECHO_T}$ac_cv_func_sigvec" >&6
-@@ -9236,7 +11084,6 @@
+@@ -9236,7 +11085,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lBSD  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6490,7 +6478,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9260,11 +11107,20 @@
+@@ -9260,11 +11108,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6513,7 +6501,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9277,7 +11133,8 @@
+@@ -9277,7 +11134,8 @@
  
  ac_cv_lib_BSD_sigvec=no
  fi
@@ -6523,7 +6511,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_sigvec" >&5
-@@ -9296,7 +11153,6 @@
+@@ -9296,7 +11154,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lucb  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6531,7 +6519,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9320,11 +11176,20 @@
+@@ -9320,11 +11177,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6554,7 +6542,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9337,7 +11202,8 @@
+@@ -9337,7 +11203,8 @@
  
  ac_cv_lib_ucb_sigvec=no
  fi
@@ -6564,7 +6552,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_sigvec" >&5
-@@ -9444,7 +11310,6 @@
+@@ -9444,7 +11311,6 @@
  		echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5
  echo $ECHO_N "checking if AFS libraries need sigvec... $ECHO_C" >&6
  						cat >conftest.$ac_ext <<_ACEOF
@@ -6572,7 +6560,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9461,11 +11326,20 @@
+@@ -9461,11 +11327,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6595,7 +6583,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9486,7 +11360,8 @@
+@@ -9486,7 +11361,8 @@
  				cyrus_afs_sigvec="yes"
  
  fi
@@ -6605,7 +6593,7 @@
  
  fi
  
-@@ -9530,7 +11405,6 @@
+@@ -9530,7 +11406,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lldap -llber $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6613,7 +6601,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9554,11 +11428,20 @@
+@@ -9554,11 +11429,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6636,7 +6624,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9571,7 +11454,8 @@
+@@ -9571,7 +11455,8 @@
  
  ac_cv_lib_ldap_ldap_initialize=no
  fi
@@ -6646,7 +6634,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-@@ -9651,7 +11535,6 @@
+@@ -9651,7 +11536,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lresolv  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6654,7 +6642,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9675,11 +11558,20 @@
+@@ -9675,11 +11559,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6677,7 +6665,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9692,7 +11584,8 @@
+@@ -9692,7 +11585,8 @@
  
  ac_cv_lib_resolv_res_search=no
  fi
@@ -6687,7 +6675,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
-@@ -9730,7 +11623,6 @@
+@@ -9730,7 +11624,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldes  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6695,7 +6683,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9754,11 +11646,20 @@
+@@ -9754,11 +11647,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6718,7 +6706,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9771,7 +11672,8 @@
+@@ -9771,7 +11673,8 @@
  
  ac_cv_lib_des_des_ecb_encrypt=no
  fi
@@ -6728,7 +6716,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
-@@ -9842,7 +11744,6 @@
+@@ -9842,7 +11745,6 @@
  echo "$as_me:$LINENO: checking krb.h usability" >&5
  echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -6736,7 +6724,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9853,11 +11754,20 @@
+@@ -9853,11 +11755,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -6759,7 +6747,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9870,7 +11780,7 @@
+@@ -9870,7 +11781,7 @@
  
  ac_header_compiler=no
  fi
@@ -6768,7 +6756,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -9878,7 +11788,6 @@
+@@ -9878,7 +11789,6 @@
  echo "$as_me:$LINENO: checking krb.h presence" >&5
  echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -6776,7 +6764,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9896,6 +11805,7 @@
+@@ -9896,6 +11806,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6784,7 +6772,7 @@
    else
      ac_cpp_err=
    fi
-@@ -9915,33 +11825,32 @@
+@@ -9915,33 +11826,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -6835,7 +6823,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -9968,7 +11877,6 @@
+@@ -9968,7 +11878,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-l${KRBLIB} $KRB_LIBS $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6843,7 +6831,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9992,11 +11900,20 @@
+@@ -9992,11 +11901,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6866,7 +6854,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10009,7 +11926,8 @@
+@@ -10009,7 +11927,8 @@
  
  eval "$as_ac_Lib=no"
  fi
@@ -6876,7 +6864,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
-@@ -10080,7 +11998,6 @@
+@@ -10080,7 +11999,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lrsaref  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6884,7 +6872,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10104,11 +12021,20 @@
+@@ -10104,11 +12022,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6907,7 +6895,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10121,7 +12047,8 @@
+@@ -10121,7 +12048,8 @@
  
  ac_cv_lib_rsaref_RSAPublicEncrypt=no
  fi
@@ -6917,7 +6905,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
-@@ -10142,7 +12069,6 @@
+@@ -10142,7 +12070,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lcrypto $LIB_RSAREF $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6925,7 +6913,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10166,11 +12092,20 @@
+@@ -10166,11 +12093,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6948,7 +6936,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10183,7 +12118,8 @@
+@@ -10183,7 +12119,8 @@
  
  ac_cv_lib_crypto_BIO_accept=no
  fi
@@ -6958,7 +6946,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_accept" >&5
-@@ -10202,7 +12138,6 @@
+@@ -10202,7 +12139,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lssl -lcrypto $LIB_RSAREF $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -6966,7 +6954,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10226,11 +12161,20 @@
+@@ -10226,11 +12162,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -6989,7 +6977,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10243,7 +12187,8 @@
+@@ -10243,7 +12188,8 @@
  
  ac_cv_lib_ssl_SSL_CTX_new=no
  fi
@@ -6999,7 +6987,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
-@@ -10335,7 +12280,6 @@
+@@ -10335,7 +12281,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lzephyr  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -7007,7 +6995,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10359,11 +12303,20 @@
+@@ -10359,11 +12304,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7030,7 +7018,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10376,7 +12329,8 @@
+@@ -10376,7 +12330,8 @@
  
  ac_cv_lib_zephyr_ZInitialize=no
  fi
@@ -7040,7 +7028,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitialize" >&5
-@@ -10468,7 +12422,6 @@
+@@ -10468,7 +12423,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lcom_err  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -7048,7 +7036,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10492,11 +12445,20 @@
+@@ -10492,11 +12446,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7071,7 +7059,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10509,7 +12471,8 @@
+@@ -10509,7 +12472,8 @@
  
  ac_cv_lib_com_err_com_err=no
  fi
@@ -7081,7 +7069,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5
-@@ -10533,7 +12496,6 @@
+@@ -10533,7 +12497,6 @@
  echo "$as_me:$LINENO: checking et/com_err.h usability" >&5
  echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -7089,7 +7077,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10544,11 +12506,20 @@
+@@ -10544,11 +12507,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -7112,7 +7100,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10561,7 +12532,7 @@
+@@ -10561,7 +12533,7 @@
  
  ac_header_compiler=no
  fi
@@ -7121,7 +7109,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -10569,7 +12540,6 @@
+@@ -10569,7 +12541,6 @@
  echo "$as_me:$LINENO: checking et/com_err.h presence" >&5
  echo $ECHO_N "checking et/com_err.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -7129,7 +7117,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10587,6 +12557,7 @@
+@@ -10587,6 +12558,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7137,7 +7125,7 @@
    else
      ac_cpp_err=
    fi
-@@ -10606,33 +12577,32 @@
+@@ -10606,33 +12578,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -7188,7 +7176,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -10669,7 +12639,6 @@
+@@ -10669,7 +12640,6 @@
  echo "$as_me:$LINENO: checking com_err.h usability" >&5
  echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -7196,7 +7184,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10680,11 +12649,20 @@
+@@ -10680,11 +12650,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -7219,7 +7207,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -10697,7 +12675,7 @@
+@@ -10697,7 +12676,7 @@
  
  ac_header_compiler=no
  fi
@@ -7228,7 +7216,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -10705,7 +12683,6 @@
+@@ -10705,7 +12684,6 @@
  echo "$as_me:$LINENO: checking com_err.h presence" >&5
  echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -7236,7 +7224,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10723,6 +12700,7 @@
+@@ -10723,6 +12701,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7244,7 +7232,7 @@
    else
      ac_cpp_err=
    fi
-@@ -10742,33 +12720,32 @@
+@@ -10742,33 +12721,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -7295,7 +7283,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -10984,7 +12961,6 @@
+@@ -10984,7 +12962,6 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -7303,7 +7291,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -11005,6 +12981,7 @@
+@@ -11005,6 +12982,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7311,7 +7299,7 @@
    else
      ac_cpp_err=
    fi
-@@ -11060,21 +13037,28 @@
+@@ -11060,21 +13038,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -7341,7 +7329,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -11105,11 +13089,20 @@
+@@ -11105,11 +13090,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7364,7 +7352,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11122,7 +13115,8 @@
+@@ -11122,7 +13116,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -7374,7 +7362,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -11132,7 +13126,14 @@
+@@ -11132,7 +13127,14 @@
  _ACEOF
  
  else
@@ -7390,7 +7378,7 @@
  fi
  done
  
-@@ -11198,21 +13199,28 @@
+@@ -11198,21 +13200,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -7420,7 +7408,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -11243,11 +13251,20 @@
+@@ -11243,11 +13252,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7443,7 +7431,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11260,7 +13277,8 @@
+@@ -11260,7 +13278,8 @@
  
  ac_cv_func_dlopen=no
  fi
@@ -7453,7 +7441,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
  echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-@@ -11276,7 +13294,6 @@
+@@ -11276,7 +13295,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -7461,7 +7449,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -11300,11 +13317,20 @@
+@@ -11300,11 +13318,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7484,7 +7472,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11317,7 +13343,8 @@
+@@ -11317,7 +13344,8 @@
  
  ac_cv_lib_dl_dlopen=no
  fi
@@ -7494,7 +7482,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-@@ -11340,21 +13367,28 @@
+@@ -11340,21 +13368,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -7524,7 +7512,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -11385,11 +13419,20 @@
+@@ -11385,11 +13420,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7547,7 +7535,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11402,7 +13445,8 @@
+@@ -11402,7 +13446,8 @@
  
  ac_cv_func_crypt=no
  fi
@@ -7557,7 +7545,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5
  echo "${ECHO_T}$ac_cv_func_crypt" >&6
-@@ -11418,7 +13462,6 @@
+@@ -11418,7 +13463,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lcrypt  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -7565,7 +7553,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -11442,11 +13485,20 @@
+@@ -11442,11 +13486,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7588,7 +7576,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11459,7 +13511,8 @@
+@@ -11459,7 +13512,8 @@
  
  ac_cv_lib_crypt_crypt=no
  fi
@@ -7598,7 +7586,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-@@ -11510,6 +13563,7 @@
+@@ -11510,6 +13564,7 @@
          platform=__solaris
          ;;
        *-*-aix*)
@@ -7606,7 +7594,7 @@
          platform=__aix
          ;;
        *)
-@@ -11529,6 +13583,8 @@
+@@ -11529,6 +13584,8 @@
         CPPFLAGS="$CPPFLAGS -I$gssapi/include"
  # We want to keep -I in our CPPFLAGS, but only if we succeed
         cmu_saved_CPPFLAGS=$CPPFLAGS
@@ -7615,7 +7603,7 @@
         LDFLAGS="$LDFLAGS -L$gssapi/lib"
  
         if test -n "$platform"; then
-@@ -11553,7 +13609,6 @@
+@@ -11553,7 +13610,6 @@
  echo "$as_me:$LINENO: checking gssapi.h usability" >&5
  echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -7623,7 +7611,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -11564,11 +13619,20 @@
+@@ -11564,11 +13620,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -7646,7 +7634,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11581,7 +13645,7 @@
+@@ -11581,7 +13646,7 @@
  
  ac_header_compiler=no
  fi
@@ -7655,7 +7643,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -11589,7 +13653,6 @@
+@@ -11589,7 +13654,6 @@
  echo "$as_me:$LINENO: checking gssapi.h presence" >&5
  echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -7663,7 +7651,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -11607,6 +13670,7 @@
+@@ -11607,6 +13671,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7671,7 +7659,7 @@
    else
      ac_cpp_err=
    fi
-@@ -11626,33 +13690,32 @@
+@@ -11626,33 +13691,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -7722,7 +7710,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -11690,7 +13753,6 @@
+@@ -11690,7 +13754,6 @@
  echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5
  echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -7730,31 +7718,30 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -11701,11 +13763,20 @@
+@@ -11701,11 +13764,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>&5
 +  (eval $ac_compile) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.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_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
 -         { ac_try='test -s conftest.$ac_objext'
++	 { 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=$?
-@@ -11718,7 +13789,7 @@
+@@ -11718,7 +13790,7 @@
  
  ac_header_compiler=no
  fi
@@ -7763,7 +7750,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -11726,7 +13797,6 @@
+@@ -11726,7 +13798,6 @@
  echo "$as_me:$LINENO: checking gssapi/gssapi.h presence" >&5
  echo $ECHO_N "checking gssapi/gssapi.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -7771,7 +7758,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -11744,6 +13814,7 @@
+@@ -11744,6 +13815,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7779,7 +7766,7 @@
    else
      ac_cpp_err=
    fi
-@@ -11763,33 +13834,32 @@
+@@ -11763,33 +13835,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -7830,7 +7817,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -11833,7 +13903,6 @@
+@@ -11833,7 +13904,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lresolv  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -7838,7 +7825,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -11857,11 +13926,20 @@
+@@ -11857,11 +13927,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7861,7 +7848,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11874,7 +13952,8 @@
+@@ -11874,7 +13953,8 @@
  
  ac_cv_lib_resolv_res_search=no
  fi
@@ -7871,7 +7858,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
-@@ -11911,7 +13990,6 @@
+@@ -11911,7 +13991,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -7879,7 +7866,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -11935,11 +14013,20 @@
+@@ -11935,11 +14014,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7902,7 +7889,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -11952,7 +14039,8 @@
+@@ -11952,7 +14040,8 @@
  
  ac_cv_lib_gssapi_gss_unwrap=no
  fi
@@ -7912,7 +7899,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
-@@ -11978,7 +14066,6 @@
+@@ -11978,7 +14067,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgssapi_krb5 $GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIB_SOCKET} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -7920,7 +7907,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12002,11 +14089,20 @@
+@@ -12002,11 +14090,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7943,7 +7930,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12019,7 +14115,8 @@
+@@ -12019,7 +14116,8 @@
  
  ac_cv_lib_gssapi_krb5_gss_unwrap=no
  fi
@@ -7953,7 +7940,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
-@@ -12063,7 +14160,6 @@
+@@ -12063,7 +14161,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgss $GSSAPIBASE_LIBS -lgss -lcstbk5 $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -7961,7 +7948,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12087,11 +14183,20 @@
+@@ -12087,11 +14184,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -7984,7 +7971,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12104,7 +14209,8 @@
+@@ -12104,7 +14210,8 @@
  
  ac_cv_lib_gss_csf_gss_acq_user=no
  fi
@@ -7994,7 +7981,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-@@ -12121,7 +14227,6 @@
+@@ -12121,7 +14228,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgss $GSSAPIBASE_LIBS -lgss $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -8002,7 +7989,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12145,11 +14250,20 @@
+@@ -12145,11 +14251,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8025,7 +8012,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12162,7 +14276,8 @@
+@@ -12162,7 +14277,8 @@
  
  ac_cv_lib_gss_csf_gss_acq_user=no
  fi
@@ -8035,7 +8022,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-@@ -12197,7 +14312,6 @@
+@@ -12197,7 +14313,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lgss -lgss $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -8043,7 +8030,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12221,11 +14335,20 @@
+@@ -12221,11 +14336,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8066,7 +8053,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12238,7 +14361,8 @@
+@@ -12238,7 +14362,8 @@
  
  ac_cv_lib_gss_gss_unwrap=no
  fi
@@ -8076,7 +8063,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_unwrap" >&5
-@@ -12297,7 +14421,6 @@
+@@ -12297,7 +14422,6 @@
   if test "$gssapi" != "no"; then
    if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
     cat >conftest.$ac_ext <<_ACEOF
@@ -8084,7 +8071,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12325,7 +14448,6 @@
+@@ -12325,7 +14449,6 @@
  
    elif test "$ac_cv_header_gssapi_h" = "yes"; then
     cat >conftest.$ac_ext <<_ACEOF
@@ -8092,7 +8079,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12347,7 +14469,6 @@
+@@ -12347,7 +14470,6 @@
    elif test "$ac_cv_header_gssapi_gssapi_h"; then
  
     cat >conftest.$ac_ext <<_ACEOF
@@ -8100,7 +8087,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12370,7 +14491,6 @@
+@@ -12370,7 +14492,6 @@
  
    if test "$gss_impl" = "cybersafe" -o "$gss_impl" = "cybersafe03"; then
     cat >conftest.$ac_ext <<_ACEOF
@@ -8108,7 +8095,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12397,7 +14517,6 @@
+@@ -12397,7 +14518,6 @@
  
    elif test "$ac_cv_header_gssapi_h" = "yes"; then
     cat >conftest.$ac_ext <<_ACEOF
@@ -8116,7 +8103,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12418,7 +14537,6 @@
+@@ -12418,7 +14538,6 @@
  
    elif test "$ac_cv_header_gssapi_gssapi_h"; then
     cat >conftest.$ac_ext <<_ACEOF
@@ -8124,7 +8111,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12454,7 +14572,6 @@
+@@ -12454,7 +14573,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lresolv  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -8132,7 +8119,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12478,11 +14595,20 @@
+@@ -12478,11 +14596,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8155,7 +8142,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12495,7 +14621,8 @@
+@@ -12495,7 +14622,8 @@
  
  ac_cv_lib_resolv_res_search=no
  fi
@@ -8165,7 +8152,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
-@@ -12519,21 +14646,28 @@
+@@ -12519,21 +14647,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -8195,7 +8182,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -12564,11 +14698,20 @@
+@@ -12564,11 +14699,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8218,7 +8205,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12581,7 +14724,8 @@
+@@ -12581,7 +14725,8 @@
  
  eval "$as_ac_var=no"
  fi
@@ -8228,7 +8215,7 @@
  fi
  echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
  echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-@@ -12663,7 +14807,6 @@
+@@ -12663,7 +14808,6 @@
  echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
  echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8236,7 +8223,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12674,11 +14817,20 @@
+@@ -12674,11 +14818,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8259,7 +8246,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12691,7 +14843,7 @@
+@@ -12691,7 +14844,7 @@
  
  ac_header_compiler=no
  fi
@@ -8268,7 +8255,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -12699,7 +14851,6 @@
+@@ -12699,7 +14852,6 @@
  echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
  echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8276,7 +8263,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12717,6 +14868,7 @@
+@@ -12717,6 +14869,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8284,7 +8271,7 @@
    else
      ac_cpp_err=
    fi
-@@ -12736,33 +14888,32 @@
+@@ -12736,33 +14889,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -8335,7 +8322,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -12794,7 +14945,6 @@
+@@ -12794,7 +14946,6 @@
  echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
  echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8343,7 +8330,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12805,11 +14955,20 @@
+@@ -12805,11 +14956,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8366,7 +8353,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -12822,7 +14981,7 @@
+@@ -12822,7 +14982,7 @@
  
  ac_header_compiler=no
  fi
@@ -8375,7 +8362,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -12830,7 +14989,6 @@
+@@ -12830,7 +14990,6 @@
  echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
  echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8383,7 +8370,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12848,6 +15006,7 @@
+@@ -12848,6 +15007,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8391,7 +8378,7 @@
    else
      ac_cpp_err=
    fi
-@@ -12867,33 +15026,32 @@
+@@ -12867,33 +15027,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -8442,7 +8429,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -12979,7 +15137,6 @@
+@@ -12979,7 +15138,6 @@
  echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
  echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8450,7 +8437,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12990,11 +15147,20 @@
+@@ -12990,11 +15148,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8473,7 +8460,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13007,7 +15173,7 @@
+@@ -13007,7 +15174,7 @@
  
  ac_header_compiler=no
  fi
@@ -8482,7 +8469,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -13015,7 +15181,6 @@
+@@ -13015,7 +15182,6 @@
  echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
  echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8490,7 +8477,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13033,6 +15198,7 @@
+@@ -13033,6 +15199,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8498,7 +8485,7 @@
    else
      ac_cpp_err=
    fi
-@@ -13052,33 +15218,32 @@
+@@ -13052,33 +15219,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -8549,7 +8536,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -13110,7 +15275,6 @@
+@@ -13110,7 +15276,6 @@
  echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
  echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8557,7 +8544,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13121,11 +15285,20 @@
+@@ -13121,11 +15286,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8580,7 +8567,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13138,7 +15311,7 @@
+@@ -13138,7 +15312,7 @@
  
  ac_header_compiler=no
  fi
@@ -8589,7 +8576,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -13146,7 +15319,6 @@
+@@ -13146,7 +15320,6 @@
  echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
  echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8597,7 +8584,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13164,6 +15336,7 @@
+@@ -13164,6 +15337,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8605,7 +8592,7 @@
    else
      ac_cpp_err=
    fi
-@@ -13183,33 +15356,32 @@
+@@ -13183,33 +15357,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -8656,7 +8643,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -13236,7 +15408,6 @@
+@@ -13236,7 +15409,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsasl2  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -8664,7 +8651,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13260,11 +15431,20 @@
+@@ -13260,11 +15432,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8687,7 +8674,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13277,7 +15457,8 @@
+@@ -13277,7 +15458,8 @@
  
  ac_cv_lib_sasl2_prop_get=no
  fi
@@ -8697,7 +8684,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_prop_get" >&5
-@@ -13350,7 +15531,6 @@
+@@ -13350,7 +15532,6 @@
  	CPPFLAGS="$CPPFLAGS $SASLFLAGS"
  
  	cat >conftest.$ac_ext <<_ACEOF
@@ -8705,7 +8692,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13384,6 +15564,7 @@
+@@ -13384,6 +15565,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8713,7 +8700,7 @@
    else
      ac_cpp_err=
    fi
-@@ -13419,7 +15600,6 @@
+@@ -13419,7 +15601,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsasl2  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -8721,7 +8708,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13443,11 +15623,20 @@
+@@ -13443,11 +15624,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8744,7 +8731,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13460,7 +15649,8 @@
+@@ -13460,7 +15650,8 @@
  
  ac_cv_lib_sasl2_sasl_checkapop=no
  fi
@@ -8754,7 +8741,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
-@@ -13570,21 +15760,28 @@
+@@ -13570,21 +15761,28 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -8784,7 +8771,7 @@
  /* Override any gcc2 internal prototype to avoid an error.  */
  #ifdef __cplusplus
  extern "C"
-@@ -13615,11 +15812,20 @@
+@@ -13615,11 +15813,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8807,7 +8794,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13632,7 +15838,8 @@
+@@ -13632,7 +15839,8 @@
  
  ac_cv_func_MD5Init=no
  fi
@@ -8817,7 +8804,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_func_MD5Init" >&5
  echo "${ECHO_T}$ac_cv_func_MD5Init" >&6
-@@ -13647,7 +15854,6 @@
+@@ -13647,7 +15855,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmd  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -8825,7 +8812,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13671,11 +15877,20 @@
+@@ -13671,11 +15878,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8848,7 +8835,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13688,7 +15903,8 @@
+@@ -13688,7 +15904,8 @@
  
  ac_cv_lib_md_MD5Init=no
  fi
@@ -8858,7 +8845,97 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5
-@@ -13730,7 +15946,6 @@
+@@ -13706,6 +15923,89 @@
+ SNMP_SUBDIRS=""
+ 
+ 
++DRACLIBS=
++
++# Check whether --with-drac or --without-drac was given.
++if test "${with_drac+set}" = set; then
++  withval="$with_drac"
++  if test -d "$withval"; then
++		LDFLAGS="$LDFLAGS -L${withval}"
++		echo "$as_me:$LINENO: checking for dracauth in -ldrac" >&5
++echo $ECHO_N "checking for dracauth in -ldrac... $ECHO_C" >&6
++if test "${ac_cv_lib_drac_dracauth+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldrac  $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 dracauth ();
++int
++main ()
++{
++dracauth ();
++  ;
++  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_drac_dracauth=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_drac_dracauth=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_drac_dracauth" >&5
++echo "${ECHO_T}$ac_cv_lib_drac_dracauth" >&6
++if test $ac_cv_lib_drac_dracauth = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define DRAC_AUTH
++_ACEOF
++
++			DRACLIBS="-ldrac"
++fi
++
++	fi
++fi;
++
++
+ 
+ 
+ 
+@@ -13730,7 +16030,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lwrap ${LIB_SOCKET} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -8866,7 +8943,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13754,11 +15969,20 @@
+@@ -13754,11 +16053,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -8889,7 +8966,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13771,7 +15995,8 @@
+@@ -13771,7 +16079,8 @@
  
  ac_cv_lib_wrap_request_init=no
  fi
@@ -8899,7 +8976,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_request_init" >&5
-@@ -13791,7 +16016,6 @@
+@@ -13791,7 +16100,6 @@
  echo "$as_me:$LINENO: checking tcpd.h usability" >&5
  echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8907,7 +8984,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13802,11 +16026,20 @@
+@@ -13802,11 +16110,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8930,7 +9007,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13819,7 +16052,7 @@
+@@ -13819,7 +16136,7 @@
  
  ac_header_compiler=no
  fi
@@ -8939,7 +9016,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -13827,7 +16060,6 @@
+@@ -13827,7 +16144,6 @@
  echo "$as_me:$LINENO: checking tcpd.h presence" >&5
  echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -8947,7 +9024,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13845,6 +16077,7 @@
+@@ -13845,6 +16161,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8955,7 +9032,7 @@
    else
      ac_cpp_err=
    fi
-@@ -13864,33 +16097,32 @@
+@@ -13864,33 +16181,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -9006,7 +9083,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -13940,7 +16172,6 @@
+@@ -13940,7 +16256,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -9014,7 +9091,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -13964,11 +16195,20 @@
+@@ -13964,11 +16279,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -9037,7 +9114,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -13981,7 +16221,8 @@
+@@ -13981,7 +16305,8 @@
  
  ac_cv_lib_nsl_yp_get_default_domain=no
  fi
@@ -9047,7 +9124,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
-@@ -14097,7 +16338,6 @@
+@@ -14097,7 +16422,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsnmp ${LIB_SOCKET} $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -9055,7 +9132,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -14121,11 +16361,20 @@
+@@ -14121,11 +16445,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -9078,7 +9155,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14138,7 +16387,8 @@
+@@ -14138,7 +16471,8 @@
  
  ac_cv_lib_snmp_sprint_objid=no
  fi
@@ -9088,7 +9165,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_sprint_objid" >&5
-@@ -14158,7 +16408,6 @@
+@@ -14158,7 +16492,6 @@
  echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5
  echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -9096,7 +9173,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -14169,11 +16418,20 @@
+@@ -14169,11 +16502,20 @@
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -9119,7 +9196,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14186,7 +16444,7 @@
+@@ -14186,7 +16528,7 @@
  
  ac_header_compiler=no
  fi
@@ -9128,7 +9205,7 @@
  echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
  echo "${ECHO_T}$ac_header_compiler" >&6
  
-@@ -14194,7 +16452,6 @@
+@@ -14194,7 +16536,6 @@
  echo "$as_me:$LINENO: checking ucd-snmp/version.h presence" >&5
  echo $ECHO_N "checking ucd-snmp/version.h presence... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
@@ -9136,7 +9213,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -14212,6 +16469,7 @@
+@@ -14212,6 +16553,7 @@
    (exit $ac_status); } >/dev/null; then
    if test -s conftest.err; then
      ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9144,7 +9221,7 @@
    else
      ac_cpp_err=
    fi
-@@ -14231,33 +16489,32 @@
+@@ -14231,33 +16573,32 @@
  echo "${ECHO_T}$ac_header_preproc" >&6
  
  # So?  What about this header?
@@ -9195,7 +9272,7 @@
  _ASBOX
      ) |
        sed "s/^/$as_me: WARNING:     /" >&2
-@@ -14307,7 +16564,6 @@
+@@ -14307,7 +16648,6 @@
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lrpm -lpopt $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
@@ -9203,7 +9280,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -14331,11 +16587,20 @@
+@@ -14331,11 +16671,20 @@
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
@@ -9226,7 +9303,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -14348,7 +16613,8 @@
+@@ -14348,7 +16697,8 @@
  
  ac_cv_lib_rpm_rpmdbOpen=no
  fi
@@ -9236,7 +9313,7 @@
  LIBS=$ac_check_lib_save_LIBS
  fi
  echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
-@@ -14440,13 +16706,13 @@
+@@ -14440,13 +16790,13 @@
        # `set' does not quote correctly, so add quotes (double-quote
        # substitution turns \\\\ into \\, and sed turns \\ into \).
        sed -n \
@@ -9253,7 +9330,7 @@
        ;;
      esac;
  } |
-@@ -14476,13 +16742,13 @@
+@@ -14476,13 +16826,13 @@
  # trailing colons and then remove the whole line if VPATH becomes empty
  # (actually we leave an empty line to preserve line numbers).
  if test "x$srcdir" = x.; then
@@ -9270,7 +9347,7 @@
  }'
  fi
  
-@@ -14493,7 +16759,7 @@
+@@ -14493,7 +16843,7 @@
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
    ac_i=`echo "$ac_i" |
@@ -9279,7 +9356,7 @@
    # 2. Add them.
    ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
    ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-@@ -14537,9 +16803,10 @@
+@@ -14537,9 +16887,10 @@
  elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
    set -o posix
  fi
@@ -9291,7 +9368,7 @@
    as_unset=unset
  else
    as_unset=false
-@@ -14558,7 +16825,7 @@
+@@ -14558,7 +16909,7 @@
    LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
    LC_TELEPHONE LC_TIME
  do
@@ -9300,7 +9377,7 @@
      eval $as_var=C; export $as_var
    else
      $as_unset $as_var
-@@ -14737,16 +17004,17 @@
+@@ -14737,16 +17088,17 @@
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
  else
@@ -9320,7 +9397,7 @@
  
  
  # IFS
-@@ -14773,7 +17041,7 @@
+@@ -14773,7 +17125,7 @@
  cat >&5 <<_CSEOF
  
  This file was extended by $as_me, which was
@@ -9329,7 +9406,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -14817,9 +17085,9 @@
+@@ -14817,9 +17169,9 @@
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
    --file=FILE[:TEMPLATE]
@@ -9341,7 +9418,7 @@
  
  Configuration files:
  $config_files
-@@ -14833,11 +17101,10 @@
+@@ -14833,11 +17185,10 @@
  cat >>$CONFIG_STATUS <<_ACEOF
  ac_cs_version="\\
  config.status
@@ -9355,7 +9432,7 @@
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."
  srcdir=$srcdir
-@@ -15038,6 +17305,7 @@
+@@ -15038,6 +17389,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
@@ -9363,7 +9440,15 @@
  s, at MAKEDEPEND@,$MAKEDEPEND,;t t
  s, at cyrus_prefix@,$cyrus_prefix,;t t
  s, at service_path@,$service_path,;t t
-@@ -15149,9 +17417,9 @@
+@@ -15111,6 +17463,7 @@
+ s, at PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
+ s, at MD5OBJ@,$MD5OBJ,;t t
+ s, at SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
++s, at DRACLIBS@,$DRACLIBS,;t t
+ s, at LIB_WRAP@,$LIB_WRAP,;t t
+ s, at SNMP_CONFIG@,$SNMP_CONFIG,;t t
+ s, at LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
+@@ -15149,9 +17502,9 @@
        (echo ':t
    /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
        if test -z "$ac_sed_cmds"; then
@@ -9375,7 +9460,7 @@
        fi
        ac_sed_frag=`expr $ac_sed_frag + 1`
        ac_beg=$ac_end
-@@ -15169,21 +17437,21 @@
+@@ -15169,21 +17522,21 @@
    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
    case $ac_file in
    - | *:- | *:-:* ) # input from stdin
@@ -9405,7 +9490,7 @@
  echo X"$ac_file" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -15199,10 +17467,10 @@
+@@ -15199,10 +17552,10 @@
        as_dirs="$as_dir $as_dirs"
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -9420,7 +9505,7 @@
  echo X"$as_dir" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -15240,12 +17508,45 @@
+@@ -15240,12 +17593,45 @@
      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
      ac_top_srcdir=$ac_top_builddir$srcdir ;;
  esac
@@ -9472,7 +9557,7 @@
  
  
    case $INSTALL in
-@@ -15253,11 +17554,6 @@
+@@ -15253,11 +17639,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -9484,7 +9569,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.  */
-@@ -15267,7 +17563,7 @@
+@@ -15267,7 +17648,7 @@
      configure_input="$ac_file.  "
    fi
    configure_input=$configure_input"Generated from `echo $ac_file_in |
@@ -9493,7 +9578,7 @@
  
    # First look for the input files in the build tree, otherwise in the
    # src tree.
-@@ -15276,26 +17572,32 @@
+@@ -15276,26 +17657,32 @@
        case $f in
        -) echo $tmp/stdin ;;
        [\\/$]*)
@@ -9539,7 +9624,7 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-@@ -15335,12 +17637,12 @@
+@@ -15335,12 +17722,12 @@
  # NAME is the cpp macro being defined and VALUE is the value it is being given.
  #
  # ac_d sets the value in "#define NAME VALUE" lines.
@@ -9555,7 +9640,7 @@
  ac_uB='$,\1#\2define\3'
  ac_uC=' '
  ac_uD=',;t'
-@@ -15349,11 +17651,11 @@
+@@ -15349,11 +17736,11 @@
    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
    case $ac_file in
    - | *:- | *:-:* ) # input from stdin
@@ -9571,7 +9656,7 @@
    * )   ac_file_in=$ac_file.in ;;
    esac
  
-@@ -15367,28 +17669,29 @@
+@@ -15367,28 +17754,29 @@
        case $f in
        -) echo $tmp/stdin ;;
        [\\/$]*)
@@ -9615,7 +9700,7 @@
  
  _ACEOF
  
-@@ -15411,9 +17714,9 @@
+@@ -15411,9 +17799,9 @@
  s,[\\$`],\\&,g
  t clear
  : clear
@@ -9627,7 +9712,7 @@
  : end
  _ACEOF
  # If some macros were called several times there might be several times
-@@ -15427,13 +17730,13 @@
+@@ -15427,13 +17815,13 @@
  # example, in the case of _POSIX_SOURCE, which is predefined and required
  # on some systems where configure will not decide to define it.
  cat >>conftest.undefs <<\_ACEOF
@@ -9643,7 +9728,7 @@
  echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
  echo '  :' >>$CONFIG_STATUS
  rm -f conftest.tail
-@@ -15442,7 +17745,7 @@
+@@ -15442,7 +17830,7 @@
    # Write a limited-size here document to $tmp/defines.sed.
    echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
    # Speed up: don't consider the non `#define' lines.
@@ -9652,7 +9737,7 @@
    # Work around the forget-to-reset-the-flag bug.
    echo 't clr' >>$CONFIG_STATUS
    echo ': clr' >>$CONFIG_STATUS
-@@ -15469,7 +17772,7 @@
+@@ -15469,7 +17857,7 @@
    # Write a limited-size here document to $tmp/undefs.sed.
    echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
    # Speed up: don't consider the non `#undef'
@@ -9661,7 +9746,7 @@
    # Work around the forget-to-reset-the-flag bug.
    echo 't clr' >>$CONFIG_STATUS
    echo ': clr' >>$CONFIG_STATUS
-@@ -15503,10 +17806,10 @@
+@@ -15503,10 +17891,10 @@
      else
        ac_dir=`(dirname "$ac_file") 2>/dev/null ||
  $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -9676,7 +9761,7 @@
  echo X"$ac_file" |
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
    	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -15522,10 +17825,10 @@
+@@ -15522,10 +17910,10 @@
        as_dirs="$as_dir $as_dirs"
        as_dir=`(dirname "$as_dir") 2>/dev/null ||
  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \