Imported Upstream version 1.3upstream/1.3

1 files changed, 356 insertions, 68 deletions

diff --git a/configure b/configure
index bdbdf43..39cb4aa 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for wallet 1.2.
+# Generated by GNU Autoconf 2.69 for wallet 1.3.
 #
 # Report bugs to <eagle@eyrie.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='wallet'
 PACKAGE_TARNAME='wallet'
-PACKAGE_VERSION='1.2'
-PACKAGE_STRING='wallet 1.2'
+PACKAGE_VERSION='1.3'
+PACKAGE_STRING='wallet 1.3'
 PACKAGE_BUGREPORT='eagle@eyrie.org'
 PACKAGE_URL=''
 
@@ -625,6 +625,10 @@ ac_includes_default="\
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
+WARNINGS_CLANG_FALSE
+WARNINGS_CLANG_TRUE
+WARNINGS_GCC_FALSE
+WARNINGS_GCC_TRUE
 REMCTLD
 LIBOBJS
 KRB5_USES_COM_ERR_FALSE
@@ -712,6 +716,7 @@ infodir
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -800,6 +805,7 @@ datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1052,6 +1058,15 @@ do
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1189,7 +1204,7 @@ fi
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1302,7 +1317,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures wallet 1.2 to adapt to many kinds of systems.
+\`configure' configures wallet 1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1342,6 +1357,7 @@ Fine tuning of the installation directories:
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1368,7 +1384,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wallet 1.2:";;
+     short | recursive ) echo "Configuration of wallet 1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1486,7 +1502,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-wallet configure 1.2
+wallet configure 1.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2195,7 +2211,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by wallet $as_me 1.2, which was
+It was created by wallet $as_me 1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2574,7 +2590,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-am__api_version='1.14'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2766,7 +2782,7 @@ else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\	*)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -3060,7 +3076,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='wallet'
- VERSION='1.2'
+ VERSION='1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3094,8 +3110,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -3177,6 +3193,8 @@ fi
 
 
 
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4675,6 +4693,31 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler is Clang" >&5
+$as_echo_n "checking if the compiler is Clang... " >&6; }
+if ${rra_cv_prog_cc_clang+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if ! __clang__
+#error
+#endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  rra_cv_prog_cc_clang=yes
+else
+  rra_cv_prog_cc_clang=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $rra_cv_prog_cc_clang" >&5
+$as_echo "$rra_cv_prog_cc_clang" >&6; }
+ if test x"$rra_cv_prog_cc_clang" = xyes; then :
+  CLANG=yes
+fi
 # Check whether --enable-largefile was given.
 if test "${enable_largefile+set}" = set; then :
   enableval=$enable_largefile;
@@ -8215,7 +8258,7 @@ fi
 
  LIBS="$KRB5_LIBS $LIBS"
  if test x"$rra_krb5_incroot" = x; then :
-  for ac_header in krb5.h krb5/krb5.h
+  for ac_header in krb5.h kerberosv5/krb5.h krb5/krb5.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -8243,6 +8286,20 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/krb5.h" >&5
+$as_echo_n "checking for kerberosv5/krb5.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/krb5.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_KRB5_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5/krb5.h" >&5
 $as_echo_n "checking for krb5/krb5.h... " >&6; }
  if test -f "${rra_krb5_incroot}/krb5/krb5.h"; then :
@@ -8340,6 +8397,8 @@ do :
   ac_fn_c_check_header_compile "$LINENO" "ibm_svc/krb5_svc.h" "ac_cv_header_ibm_svc_krb5_svc_h" "
 #if HAVE_KRB5_H
 # include <krb5.h>
+#elif HAVE_KERBEROSV5_KRB5_H
+# include <kerberosv5/krb5.h>
 #else
 # include <krb5/krb5.h>
 #endif
@@ -8401,18 +8460,50 @@ else
 fi
 fi
 
-                  for ac_header in et/com_err.h
+                  if test x"$rra_krb5_incroot" = x; then :
+  for ac_header in et/com_err.h kerberosv5/com_err.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_et_com_err_h" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_ET_COM_ERR_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for et/com_err.h" >&5
+$as_echo_n "checking for et/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/et/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ET_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/com_err.h" >&5
+$as_echo_n "checking for kerberosv5/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
 fi
 
 fi
@@ -9331,7 +9422,7 @@ fi
 
  LIBS="$KRB5_LIBS $LIBS"
  if test x"$rra_krb5_incroot" = x; then :
-  for ac_header in krb5.h krb5/krb5.h
+  for ac_header in krb5.h kerberosv5/krb5.h krb5/krb5.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -9359,6 +9450,20 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/krb5.h" >&5
+$as_echo_n "checking for kerberosv5/krb5.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/krb5.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_KRB5_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5/krb5.h" >&5
 $as_echo_n "checking for krb5/krb5.h... " >&6; }
  if test -f "${rra_krb5_incroot}/krb5/krb5.h"; then :
@@ -9423,6 +9528,8 @@ do :
   ac_fn_c_check_header_compile "$LINENO" "ibm_svc/krb5_svc.h" "ac_cv_header_ibm_svc_krb5_svc_h" "
 #if HAVE_KRB5_H
 # include <krb5.h>
+#elif HAVE_KERBEROSV5_KRB5_H
+# include <kerberosv5/krb5.h>
 #else
 # include <krb5/krb5.h>
 #endif
@@ -9438,18 +9545,50 @@ fi
 done
 
 else
-  for ac_header in et/com_err.h
+  if test x"$rra_krb5_incroot" = x; then :
+  for ac_header in et/com_err.h kerberosv5/com_err.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_et_com_err_h" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_ET_COM_ERR_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for et/com_err.h" >&5
+$as_echo_n "checking for et/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/et/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ET_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/com_err.h" >&5
+$as_echo_n "checking for kerberosv5/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
 fi
 done
 
@@ -9474,7 +9613,7 @@ fi
  LDFLAGS="$KRB5_LDFLAGS $LDFLAGS"
  LIBS="$KRB5_LIBS $LIBS"
      if test x"$rra_krb5_incroot" = x; then :
-  for ac_header in krb5.h krb5/krb5.h
+  for ac_header in krb5.h kerberosv5/krb5.h krb5/krb5.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -9502,7 +9641,21 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5/krb5.h" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/krb5.h" >&5
+$as_echo_n "checking for kerberosv5/krb5.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/krb5.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_KRB5_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5/krb5.h" >&5
 $as_echo_n "checking for krb5/krb5.h... " >&6; }
  if test -f "${rra_krb5_incroot}/krb5/krb5.h"; then :
 
@@ -9566,6 +9719,8 @@ do :
   ac_fn_c_check_header_compile "$LINENO" "ibm_svc/krb5_svc.h" "ac_cv_header_ibm_svc_krb5_svc_h" "
 #if HAVE_KRB5_H
 # include <krb5.h>
+#elif HAVE_KERBEROSV5_KRB5_H
+# include <kerberosv5/krb5.h>
 #else
 # include <krb5/krb5.h>
 #endif
@@ -9581,18 +9736,50 @@ fi
 done
 
 else
-  for ac_header in et/com_err.h
+  if test x"$rra_krb5_incroot" = x; then :
+  for ac_header in et/com_err.h kerberosv5/com_err.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_et_com_err_h" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_ET_COM_ERR_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for et/com_err.h" >&5
+$as_echo_n "checking for et/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/et/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ET_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/com_err.h" >&5
+$as_echo_n "checking for kerberosv5/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
 fi
 done
 
@@ -10436,7 +10623,7 @@ fi
 
  LIBS="$KRB5_LIBS $LIBS"
  if test x"$rra_krb5_incroot" = x; then :
-  for ac_header in krb5.h krb5/krb5.h
+  for ac_header in krb5.h kerberosv5/krb5.h krb5/krb5.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -10464,6 +10651,20 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/krb5.h" >&5
+$as_echo_n "checking for kerberosv5/krb5.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/krb5.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_KRB5_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5/krb5.h" >&5
 $as_echo_n "checking for krb5/krb5.h... " >&6; }
  if test -f "${rra_krb5_incroot}/krb5/krb5.h"; then :
@@ -10528,6 +10729,8 @@ do :
   ac_fn_c_check_header_compile "$LINENO" "ibm_svc/krb5_svc.h" "ac_cv_header_ibm_svc_krb5_svc_h" "
 #if HAVE_KRB5_H
 # include <krb5.h>
+#elif HAVE_KERBEROSV5_KRB5_H
+# include <kerberosv5/krb5.h>
 #else
 # include <krb5/krb5.h>
 #endif
@@ -10543,18 +10746,50 @@ fi
 done
 
 else
-  for ac_header in et/com_err.h
+  if test x"$rra_krb5_incroot" = x; then :
+  for ac_header in et/com_err.h kerberosv5/com_err.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_et_com_err_h" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_ET_COM_ERR_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for et/com_err.h" >&5
+$as_echo_n "checking for et/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/et/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ET_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/com_err.h" >&5
+$as_echo_n "checking for kerberosv5/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
 fi
 done
 
@@ -11399,7 +11634,7 @@ fi
 
  LIBS="$KRB5_LIBS $LIBS"
  if test x"$rra_krb5_incroot" = x; then :
-  for ac_header in krb5.h krb5/krb5.h
+  for ac_header in krb5.h kerberosv5/krb5.h krb5/krb5.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -11427,6 +11662,20 @@ else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/krb5.h" >&5
+$as_echo_n "checking for kerberosv5/krb5.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/krb5.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_KRB5_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5/krb5.h" >&5
 $as_echo_n "checking for krb5/krb5.h... " >&6; }
  if test -f "${rra_krb5_incroot}/krb5/krb5.h"; then :
@@ -11491,6 +11740,8 @@ do :
   ac_fn_c_check_header_compile "$LINENO" "ibm_svc/krb5_svc.h" "ac_cv_header_ibm_svc_krb5_svc_h" "
 #if HAVE_KRB5_H
 # include <krb5.h>
+#elif HAVE_KERBEROSV5_KRB5_H
+# include <kerberosv5/krb5.h>
 #else
 # include <krb5/krb5.h>
 #endif
@@ -11506,18 +11757,50 @@ fi
 done
 
 else
-  for ac_header in et/com_err.h
+  if test x"$rra_krb5_incroot" = x; then :
+  for ac_header in et/com_err.h kerberosv5/com_err.h
 do :
-  ac_fn_c_check_header_mongrel "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_et_com_err_h" = xyes; then :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_ET_COM_ERR_H 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for et/com_err.h" >&5
+$as_echo_n "checking for et/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/et/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_ET_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kerberosv5/com_err.h" >&5
+$as_echo_n "checking for kerberosv5/com_err.h... " >&6; }
+ if test -f "${rra_krb5_incroot}/kerberosv5/com_err.h"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_KERBEROSV5_COM_ERR_H 1
+_ACEOF
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+fi
 fi
 done
 
@@ -11591,6 +11874,8 @@ else
 
 #if HAVE_KRB5_H
 # include <krb5.h>
+#elif HAVE_KERBEROSV5_KRB5_H
+# include <kerberosv5/krb5.h>
 #else
 # include <krb5/krb5.h>
 #endif
@@ -11624,6 +11909,8 @@ done
 ac_fn_c_check_decl "$LINENO" "krb5_kt_free_entry" "ac_cv_have_decl_krb5_kt_free_entry" "
 #if HAVE_KRB5_H
 # include <krb5.h>
+#elif HAVE_KERBEROSV5_KRB5_H
+# include <kerberosv5/krb5.h>
 #else
 # include <krb5/krb5.h>
 #endif
@@ -11653,6 +11940,8 @@ _ACEOF
 ac_fn_c_check_member "$LINENO" "krb5_keytab_entry" "keyblock" "ac_cv_member_krb5_keytab_entry_keyblock" "
 #if HAVE_KRB5_H
 # include <krb5.h>
+#elif HAVE_KERBEROSV5_KRB5_H
+# include <kerberosv5/krb5.h>
 #else
 # include <krb5/krb5.h>
 #endif
@@ -11764,7 +12053,7 @@ $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
 
 fi
 
-for ac_header in sys/bitypes.h sys/uio.h syslog.h
+for ac_header in sys/bitypes.h sys/uio.h sys/time.h syslog.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -12115,32 +12404,6 @@ esac
 
 fi
 
-ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
-if test "x$ac_cv_func_strlcat" = xyes; then :
-  $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" strlcat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strlcat.$ac_objext"
- ;;
-esac
-
-fi
-
-ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
-if test "x$ac_cv_func_strlcpy" = xyes; then :
-  $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
-
-else
-  case " $LIBOBJS " in
-  *" strlcpy.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext"
- ;;
-esac
-
-fi
-
 
 
 
@@ -12193,6 +12456,23 @@ _ACEOF
 
 fi
 
+ if test x"$GCC" = xyes && test x"$CLANG" != xyes; then
+  WARNINGS_GCC_TRUE=
+  WARNINGS_GCC_FALSE='#'
+else
+  WARNINGS_GCC_TRUE='#'
+  WARNINGS_GCC_FALSE=
+fi
+
+ if test x"$CLANG" = xyes; then
+  WARNINGS_CLANG_TRUE=
+  WARNINGS_CLANG_FALSE='#'
+else
+  WARNINGS_CLANG_TRUE='#'
+  WARNINGS_CLANG_FALSE=
+fi
+
+
 ac_config_headers="$ac_config_headers config.h"
 
 ac_config_files="$ac_config_files Makefile"
@@ -12348,6 +12628,14 @@ if test -z "${KRB5_USES_COM_ERR_TRUE}" && test -z "${KRB5_USES_COM_ERR_FALSE}";
   as_fn_error $? "conditional \"KRB5_USES_COM_ERR\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WARNINGS_GCC_TRUE}" && test -z "${WARNINGS_GCC_FALSE}"; then
+  as_fn_error $? "conditional \"WARNINGS_GCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WARNINGS_CLANG_TRUE}" && test -z "${WARNINGS_CLANG_FALSE}"; then
+  as_fn_error $? "conditional \"WARNINGS_CLANG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -12745,7 +13033,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by wallet $as_me 1.2, which was
+This file was extended by wallet $as_me 1.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12811,7 +13099,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-wallet config.status 1.2
+wallet config.status 1.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"