25 files changed, 1573 insertions, 1183 deletions

diff --git a/Makefile.in b/Makefile.in
index feae123e..b49df208 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -202,6 +202,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/alpine/Makefile.in b/alpine/Makefile.in
index d8cea119..021b870e 100644
--- a/alpine/Makefile.in
+++ b/alpine/Makefile.in
@@ -210,6 +210,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/alpine/osdep/Makefile.in b/alpine/osdep/Makefile.in
index be3b1913..89146ef9 100644
--- a/alpine/osdep/Makefile.in
+++ b/alpine/osdep/Makefile.in
@@ -147,6 +147,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index 32716030..740025e2 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -821,6 +821,7 @@ MAKE
 LN
 CP
 RM
+LIBTOOL_DEPS
 CPP
 OTOOL64
 OTOOL
@@ -11502,6 +11503,7 @@ CC="$lt_save_CC"
 
 
 
+
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index 21bfccec..88fe6850 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -1,7 +1,7 @@
 @%:@! /bin/sh
 @%:@ From configure.ac Rev:2 by chappa@washington.edu.
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.1.
+@%:@ Generated by GNU Autoconf 2.69 for alpine 2.11.2.
 @%:@
 @%:@ Report bugs to <chappa@washington.edu>.
 @%:@ 
@@ -730,8 +730,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='alpine'
 PACKAGE_TARNAME='alpine'
-PACKAGE_VERSION='2.11.1'
-PACKAGE_STRING='alpine 2.11.1'
+PACKAGE_VERSION='2.11.2'
+PACKAGE_STRING='alpine 2.11.2'
 PACKAGE_BUGREPORT='chappa@washington.edu'
 PACKAGE_URL=''
 
@@ -1593,7 +1593,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 alpine 2.11.1 to adapt to many kinds of systems.
+\`configure' configures alpine 2.11.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1663,7 +1663,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of alpine 2.11.1:";;
+     short | recursive ) echo "Configuration of alpine 2.11.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1947,7 +1947,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-alpine configure 2.11.1
+alpine configure 2.11.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2553,7 +2553,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 alpine $as_me 2.11.1, which was
+It was created by alpine $as_me 2.11.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3374,7 +3374,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='alpine'
- VERSION='2.11.1'
+ VERSION='2.11.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20092,7 +20092,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 alpine $as_me 2.11.1, which was
+This file was extended by alpine $as_me 2.11.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20158,7 +20158,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="\\
-alpine config.status 2.11.1
+alpine config.status 2.11.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2
index 32716030..740025e2 100644
--- a/autom4te.cache/output.2
+++ b/autom4te.cache/output.2
@@ -821,6 +821,7 @@ MAKE
 LN
 CP
 RM
+LIBTOOL_DEPS
 CPP
 OTOOL64
 OTOOL
@@ -11502,6 +11503,7 @@ CC="$lt_save_CC"
 
 
 
+
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 8933b7fe..0e62d8f3 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -15,57 +15,57 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_PROG_F77_C_O' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
-                        'm4_pattern_forbid' => 1,
+                        'AM_PROG_F77_C_O' => 1,
                         'AC_INIT' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
+                        'm4_pattern_forbid' => 1,
                         '_AM_COND_IF' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'AC_SUBST' => 1,
-                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_FC_SRCEXT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_PATH_GUILE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_CONFIG_LINKS' => 1,
                         'm4_sinclude' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_NLS' => 1,
                         'AC_FC_PP_DEFINE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        '_m4_warn' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
+                        '_m4_warn' => 1,
                         'AM_PROG_CXX_C_O' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
                         '_AM_COND_ENDIF' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
                         'AM_SILENT_RULES' => 1,
                         'AM_PROG_MOC' => 1,
                         'AC_CONFIG_FILES' => 1,
-                        'LT_INIT' => 1,
                         'include' => 1,
-                        'AM_GNU_GETTEXT' => 1,
+                        'LT_INIT' => 1,
                         'AM_PROG_AR' => 1,
+                        'AM_GNU_GETTEXT' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
                         'AM_PROG_FC_C_O' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
                         'AC_FC_FREEFORM' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
                         'AH_OUTPUT' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'sinclude' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'm4_pattern_allow' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AM_POT_TOOLS' => 1,
@@ -88,57 +88,57 @@
                         'configure.ac'
                       ],
                       {
-                        '_LT_AC_TAGCONFIG' => 1,
                         'AM_PROG_F77_C_O' => 1,
-                        'AC_INIT' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'm4_pattern_forbid' => 1,
-                        '_AM_COND_IF' => 1,
+                        'AC_INIT' => 1,
                         'AC_CANONICAL_TARGET' => 1,
-                        'AC_SUBST' => 1,
+                        '_AM_COND_IF' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_FC_SRCEXT' => 1,
+                        'AC_SUBST' => 1,
                         'AC_CANONICAL_HOST' => 1,
+                        'AC_FC_SRCEXT' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        'AM_PATH_GUILE' => 1,
                         'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_PATH_GUILE' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
                         'AC_CONFIG_LINKS' => 1,
-                        'm4_sinclude' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
                         'LT_SUPPORTED_TAG' => 1,
+                        'm4_sinclude' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_NLS' => 1,
                         'AC_FC_PP_DEFINE' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
                         '_m4_warn' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
                         'AM_PROG_CXX_C_O' => 1,
-                        '_AM_COND_ENDIF' => 1,
                         '_AM_MAKEFILE_INCLUDE' => 1,
+                        '_AM_COND_ENDIF' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
                         'AM_SILENT_RULES' => 1,
                         'AM_PROG_MOC' => 1,
                         'AC_CONFIG_FILES' => 1,
-                        'include' => 1,
                         'LT_INIT' => 1,
-                        'AM_PROG_AR' => 1,
+                        'include' => 1,
                         'AM_GNU_GETTEXT' => 1,
+                        'AM_PROG_AR' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'AM_PROG_FC_C_O' => 1,
                         'AC_CANONICAL_BUILD' => 1,
+                        'AM_PROG_FC_C_O' => 1,
                         'AC_FC_FREEFORM' => 1,
-                        'AH_OUTPUT' => 1,
                         'AC_FC_PP_SRCEXT' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AH_OUTPUT' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        'sinclude' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         'm4_pattern_allow' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'sinclude' => 1,
                         'AM_CONDITIONAL' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AM_POT_TOOLS' => 1,
@@ -230,13 +230,13 @@
                         'gt_PRINTF_POSIX' => 1,
                         'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
                         '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
                         'gl_LOCK_EARLY' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
                         '_m4_warn' => 1,
                         'AC_LIBTOOL_OBJDIR' => 1,
                         'gl_FUNC_ARGZ' => 1,
-                        'AM_SANITY_CHECK' => 1,
                         'LTOBSOLETE_VERSION' => 1,
+                        'AM_SANITY_CHECK' => 1,
                         'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
                         'LT_LIB_M' => 1,
@@ -248,21 +248,21 @@
                         '_AM_PROG_TAR' => 1,
                         'LT_SYS_SYMBOL_USCORE' => 1,
                         'AC_LIBTOOL_GCJ' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
                         'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
                         'AC_LIB_ARG_WITH' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_LT_AC_LANG_F77' => 1,
                         'AC_LTDL_DLLIB' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         '_AM_AUTOCONF_VERSION' => 1,
                         'AM_DISABLE_SHARED' => 1,
                         '_LTDL_SETUP' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
                         'AM_PROG_LIBTOOL' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
                         'AM_PROG_LD' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LIB_LTDL' => 1,
                         'gt_INTL_MACOSX' => 1,
                         'AM_ICONV_LINK' => 1,
                         'AC_LIB_PREPARE_MULTILIB' => 1,
@@ -279,60 +279,60 @@
                         'LTDL_CONVENIENCE' => 1,
                         '_AM_SET_OPTION' => 1,
                         'AC_LTDL_PREOPEN' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
                         'gl_LOCK_EARLY_BODY' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
                         'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
                         'gl_PREREQ_ARGZ' => 1,
                         'AC_LIB_PREFIX' => 1,
                         'gt_TYPE_LONGDOUBLE' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'LT_SUPPORTED_TAG' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'LT_PROG_RC' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
                         'AC_DEFUN_ONCE' => 1,
                         '_LT_AC_LANG_GCJ' => 1,
                         'AC_' => 1,
                         'AC_LTDL_OBJDIR' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
                         'gt_INTDIV0' => 1,
-                        'AC_LIBTOOL_RC' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
                         'AM_ICONV' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_RC' => 1,
                         '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AM_SILENT_RULES' => 1,
                         'include' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
                         'LT_AC_PROG_SED' => 1,
                         'AM_ENABLE_SHARED' => 1,
-                        'gl_AC_TYPE_UNSIGNED_LONG_LONG' => 1,
                         'AC_LIB_APPENDTOVAR' => 1,
-                        'LTDL_INSTALLABLE' => 1,
+                        'gl_AC_TYPE_UNSIGNED_LONG_LONG' => 1,
                         'AM_GNU_GETTEXT' => 1,
+                        'LTDL_INSTALLABLE' => 1,
                         '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'AC_ENABLE_SHARED' => 1,
                         'AM_POSTPROCESS_PO_MAKEFILE' => 1,
+                        'AC_ENABLE_SHARED' => 1,
                         'AC_LIB_WITH_FINAL_PREFIX' => 1,
                         'gt_TYPE_WINT_T' => 1,
-                        'AC_ENABLE_STATIC' => 1,
                         'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_ENABLE_STATIC' => 1,
                         '_LT_AC_TAGVAR' => 1,
                         'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
                         'AM_CONDITIONAL' => 1,
                         'LT_LIB_DLLOAD' => 1,
                         'AM_LANGINFO_CODESET' => 1,
                         'gl_AC_HEADER_INTTYPES_H' => 1,
-                        'LTDL_INIT' => 1,
                         'LTVERSION_VERSION' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
+                        'LTDL_INIT' => 1,
                         'm4_include' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
                         'AC_PROG_EGREP' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AC_PATH_MAGIC' => 1,
                         'PINEVAR' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'gl_PREREQ_LOCK' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
                         'AM_MAKE_INCLUDE' => 1,
                         'LT_CMD_MAX_LEN' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
@@ -344,102 +344,476 @@
                         'AC_LIBTOOL_COMPILER_OPTION' => 1,
                         'AC_DISABLE_SHARED' => 1,
                         '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
                         'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
                         'AC_PROG_LD_RELOAD_FLAG' => 1,
                         'AC_LTDL_DLSYM_USCORE' => 1,
-                        'LT_LANG' => 1,
                         'AM_MISSING_HAS_RUN' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'LT_LANG' => 1,
                         'AC_TYPE_LONG_LONG_INT' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_OUTPUT' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
                         'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'LT_OUTPUT' => 1,
                         'AC_LIB_PROG_LD_GNU' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
                         'AM_NLS' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
                         'AC_WITH_LTDL' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
                         'gt_INTL_SUBDIR_CORE' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
                         'LT_AC_PROG_RC' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
                         'LT_INIT' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
                         'LT_AC_PROG_GCJ' => 1,
-                        'AM_DISABLE_STATIC' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
                         'AM_DEP_TRACK' => 1,
+                        'AM_DISABLE_STATIC' => 1,
                         '_AC_PROG_LIBTOOL' => 1,
                         '_AM_IF_OPTION' => 1,
                         'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIBTOOL_F77' => 1,
                         'm4_pattern_allow' => 1,
+                        'AC_LIBTOOL_F77' => 1,
                         'AM_PATH_PROG_WITH_TEST' => 1,
                         'AM_SET_LEADING_DOT' => 1,
                         'LT_AC_PROG_EGREP' => 1,
                         '_AM_DEPENDENCIES' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
                         'gt_CHECK_DECL' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
                         'LTOPTIONS_VERSION' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
                         'AC_LIB_LINKFLAGS' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
                         'AM_PROG_NM' => 1,
                         'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
                         'AM_GNU_GETTEXT_NEED' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'jm_MAINTAINER_MODE' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
                         'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'jm_MAINTAINER_MODE' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
                         'gl_XSIZE' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
                         'LT_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
                         'gt_GLIBC2' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
                         'gl_AC_TYPE_UINTMAX_T' => 1,
                         'gl_LOCK' => 1,
                         'AM_INTL_SUBDIR' => 1,
-                        'AC_DISABLE_STATIC' => 1,
                         'gl_VISIBILITY' => 1,
-                        'gt_TYPE_WCHAR_T' => 1,
+                        'AC_DISABLE_STATIC' => 1,
                         'PINEVAR_UNQUOTED' => 1,
+                        'gt_TYPE_WCHAR_T' => 1,
                         'LT_PATH_NM' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AC_LTDL_SHLIBEXT' => 1,
                         '_LT_AC_LOCK' => 1,
                         '_LT_AC_LANG_RC_CONFIG' => 1,
                         'LT_SYS_MODULE_PATH' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
                         'LT_WITH_LTDL' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
                         'AC_LTDL_SHLIBPATH' => 1,
                         'AM_AUX_DIR_EXPAND' => 1,
-                        'gl_GLIBC21' => 1,
                         'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'gl_GLIBC21' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
                         '_LT_COMPILER_OPTION' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_AM_SET_OPTIONS' => 1,
                         'AM_RUN_LOG' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
                         'AC_LIB_LINKFLAGS_BODY' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AC_CHECK_LIBM' => 1,
                         'ACX_PTHREAD' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'LT_PATH_LD' => 1,
                         'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+                        'gt_LC_MESSAGES' => 1,
                         '_AM_MANGLE_OPTION' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'gl_LOCK_BODY' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_LIB_PROG_LD' => 1
+                      }
+                    ], 'Autom4te::Request' ),
+             bless( [
+                      '3',
+                      1,
+                      [
+                        '/usr/local/share/autoconf'
+                      ],
+                      [
+                        '/usr/local/share/autoconf/autoconf/autoconf.m4f',
+                        '/usr/share/aclocal/argz.m4',
+                        '/usr/share/aclocal/codeset.m4',
+                        '/usr/share/aclocal/fcntl-o.m4',
+                        '/usr/share/aclocal/gettext.m4',
+                        '/usr/share/aclocal/glibc2.m4',
+                        '/usr/share/aclocal/glibc21.m4',
+                        '/usr/share/aclocal/iconv.m4',
+                        '/usr/share/aclocal/intdiv0.m4',
+                        '/usr/share/aclocal/intl.m4',
+                        '/usr/share/aclocal/intlmacosx.m4',
+                        '/usr/share/aclocal/intmax.m4',
+                        '/usr/share/aclocal/inttypes-pri.m4',
+                        '/usr/share/aclocal/inttypes_h.m4',
+                        '/usr/share/aclocal/lcmessage.m4',
+                        '/usr/share/aclocal/lib-ld.m4',
+                        '/usr/share/aclocal/lib-link.m4',
+                        '/usr/share/aclocal/lib-prefix.m4',
+                        '/usr/share/aclocal/libtool.m4',
+                        '/usr/share/aclocal/lock.m4',
+                        '/usr/share/aclocal/longlong.m4',
+                        '/usr/share/aclocal/ltdl.m4',
+                        '/usr/share/aclocal/ltoptions.m4',
+                        '/usr/share/aclocal/ltsugar.m4',
+                        '/usr/share/aclocal/ltversion.m4',
+                        '/usr/share/aclocal/lt~obsolete.m4',
+                        '/usr/share/aclocal/nls.m4',
+                        '/usr/share/aclocal/po.m4',
+                        '/usr/share/aclocal/printf-posix.m4',
+                        '/usr/share/aclocal/progtest.m4',
+                        '/usr/share/aclocal/size_max.m4',
+                        '/usr/share/aclocal/stdint_h.m4',
+                        '/usr/share/aclocal/threadlib.m4',
+                        '/usr/share/aclocal/uintmax_t.m4',
+                        '/usr/share/aclocal/visibility.m4',
+                        '/usr/share/aclocal/wchar_t.m4',
+                        '/usr/share/aclocal/wint_t.m4',
+                        '/usr/share/aclocal/xsize.m4',
+                        '/usr/share/aclocal-1.11/amversion.m4',
+                        '/usr/share/aclocal-1.11/auxdir.m4',
+                        '/usr/share/aclocal-1.11/cond.m4',
+                        '/usr/share/aclocal-1.11/depend.m4',
+                        '/usr/share/aclocal-1.11/depout.m4',
+                        '/usr/share/aclocal-1.11/init.m4',
+                        '/usr/share/aclocal-1.11/install-sh.m4',
+                        '/usr/share/aclocal-1.11/lead-dot.m4',
+                        '/usr/share/aclocal-1.11/maintainer.m4',
+                        '/usr/share/aclocal-1.11/make.m4',
+                        '/usr/share/aclocal-1.11/missing.m4',
+                        '/usr/share/aclocal-1.11/mkdirp.m4',
+                        '/usr/share/aclocal-1.11/options.m4',
+                        '/usr/share/aclocal-1.11/runlog.m4',
+                        '/usr/share/aclocal-1.11/sanity.m4',
+                        '/usr/share/aclocal-1.11/silent.m4',
+                        '/usr/share/aclocal-1.11/strip.m4',
+                        '/usr/share/aclocal-1.11/substnot.m4',
+                        '/usr/share/aclocal-1.11/tar.m4',
+                        'configure.ac'
+                      ],
+                      {
+                        'AM_ENABLE_STATIC' => 1,
+                        'AM_XGETTEXT_OPTION_INIT' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'AC_DEFUN' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'gl_AC_HEADER_STDINT_H' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'gl_SIZE_MAX' => 1,
+                        'AC_LIB_RPATH' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'gt_PRINTF_POSIX' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_m4_warn' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'LT_LIB_M' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_LIB_ARG_WITH' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'gl_THREADLIB_EARLY_BODY' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'gt_INTL_MACOSX' => 1,
+                        'AM_ICONV_LINK' => 1,
+                        '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+                        'AC_LIB_PREPARE_MULTILIB' => 1,
+                        'AU_DEFUN' => 1,
+                        'AC_PROG_NM' => 1,
+                        'gl_THREADLIB_BODY' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'gt_TYPE_INTMAX_T' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AM_ICONV_LINKFLAGS_BODY' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        'AC_LIB_PREFIX' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LT_PROG_RC' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'gt_INTDIV0' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AM_ICONV' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'include' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'AC_LIB_APPENDTOVAR' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AM_POSTPROCESS_PO_MAKEFILE' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LIB_WITH_FINAL_PREFIX' => 1,
+                        'gt_TYPE_WINT_T' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'AM_LANGINFO_CODESET' => 1,
+                        'gl_AC_HEADER_INTTYPES_H' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'LTDL_INIT' => 1,
+                        'm4_include' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'PINEVAR' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'gl_PREREQ_LOCK' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'gt_INTTYPES_PRI' => 1,
+                        'AM_PO_SUBDIRS' => 1,
+                        'AC_LIB_PREPARE_PREFIX' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'LT_LANG' => 1,
+                        'AC_TYPE_LONG_LONG_INT' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AC_LIB_PROG_LD_GNU' => 1,
+                        'gl_THREADLIB' => 1,
+                        'AM_NLS' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'gt_INTL_SUBDIR_CORE' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'LT_INIT' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'gl_THREADLIB_EARLY' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'AC_COMPUTE_INT' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AM_PATH_PROG_WITH_TEST' => 1,
+                        'gl_FCNTL_O_FLAGS' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'gt_CHECK_DECL' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'AM_GNU_GETTEXT_NEED' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'jm_MAINTAINER_MODE' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'gl_XSIZE' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'gt_GLIBC2' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'gl_AC_TYPE_UINTMAX_T' => 1,
+                        'gl_LOCK' => 1,
+                        'AM_INTL_SUBDIR' => 1,
+                        'gl_VISIBILITY' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'PINEVAR_UNQUOTED' => 1,
+                        'gt_TYPE_WCHAR_T' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'gl_DISABLE_THREADS' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
+                        'gl_GLIBC21' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AM_RUN_LOG' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'AC_LIB_LINKFLAGS_BODY' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AC_LIB_FROMPACKAGE' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
                         'gt_LC_MESSAGES' => 1,
                         'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
                         'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
                         'AM_SET_DEPDIR' => 1,
                         '_LT_CC_BASENAME' => 1,
-                        'gl_LOCK_BODY' => 1,
                         '_LT_LIBOBJ' => 1,
                         'AC_LIB_PROG_LD' => 1
                       }
+                    ], 'Autom4te::Request' ),
+             bless( [
+                      '4',
+                      1,
+                      [
+                        '/usr/local/share/autoconf'
+                      ],
+                      [
+                        '/usr/local/share/autoconf/m4sugar/m4sugar.m4',
+                        '/usr/local/share/autoconf/m4sugar/m4sh.m4',
+                        '/usr/local/share/autoconf/autoconf/autoconf.m4',
+                        'aclocal.m4',
+                        '/dev/null'
+                      ],
+                      {
+                        'AM_PROG_F77_C_O' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_INIT' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AU_DEFINE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'm4_sinclude' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_NLS' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        '_m4_warn' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'LT_INIT' => 1,
+                        'include' => 1,
+                        'm4_define' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'sinclude' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'define' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'm4_include' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AC_SUBST_TRACE' => 1
+                      }
                     ], 'Autom4te::Request' )
            );
 
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
index 113707b2..bb898165 100644
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -500,983 +500,986 @@ m4trace:configure.ac:48: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you h
 @%:@undef HAVE_UNISTD_H])
 m4trace:configure.ac:48: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DLFCN_H])
 m4trace:configure.ac:48: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-m4trace:configure.ac:50: -1- AC_SUBST([AR])
-m4trace:configure.ac:50: -1- AC_SUBST_TRACE([AR])
-m4trace:configure.ac:50: -1- m4_pattern_allow([^AR$])
-m4trace:configure.ac:51: -1- AC_SUBST([RM])
-m4trace:configure.ac:51: -1- AC_SUBST_TRACE([RM])
-m4trace:configure.ac:51: -1- m4_pattern_allow([^RM$])
-m4trace:configure.ac:52: -1- AC_SUBST([CP])
-m4trace:configure.ac:52: -1- AC_SUBST_TRACE([CP])
-m4trace:configure.ac:52: -1- m4_pattern_allow([^CP$])
-m4trace:configure.ac:53: -1- AC_SUBST([LN])
-m4trace:configure.ac:53: -1- AC_SUBST_TRACE([LN])
-m4trace:configure.ac:53: -1- m4_pattern_allow([^LN$])
-m4trace:configure.ac:54: -1- AC_SUBST([SED])
-m4trace:configure.ac:54: -1- AC_SUBST_TRACE([SED])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:55: -1- AC_SUBST([MAKE])
-m4trace:configure.ac:55: -1- AC_SUBST_TRACE([MAKE])
-m4trace:configure.ac:55: -1- m4_pattern_allow([^MAKE$])
-m4trace:configure.ac:60: -1- AM_GNU_GETTEXT([external])
-m4trace:configure.ac:60: -1- AM_NLS
-m4trace:configure.ac:60: -1- AC_SUBST([USE_NLS])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([USE_NLS])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^USE_NLS$])
-m4trace:configure.ac:60: -1- AC_SUBST([MSGFMT])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([MSGFMT])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^MSGFMT$])
-m4trace:configure.ac:60: -1- AC_SUBST([GMSGFMT])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([GMSGFMT])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^GMSGFMT$])
-m4trace:configure.ac:60: -1- AC_SUBST([MSGFMT_015])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([MSGFMT_015])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^MSGFMT_015$])
-m4trace:configure.ac:60: -1- AC_SUBST([GMSGFMT_015])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([GMSGFMT_015])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^GMSGFMT_015$])
-m4trace:configure.ac:60: -1- AC_SUBST([XGETTEXT])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([XGETTEXT])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^XGETTEXT$])
-m4trace:configure.ac:60: -1- AC_SUBST([XGETTEXT_015])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([XGETTEXT_015])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^XGETTEXT_015$])
-m4trace:configure.ac:60: -1- AC_SUBST([MSGMERGE])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([MSGMERGE])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^MSGMERGE$])
-m4trace:configure.ac:60: -1- AC_SUBST([localedir])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([localedir])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.ac:60: -1- AC_REQUIRE_AUX_FILE([config.rpath])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.ac:49: -1- AC_SUBST([LIBTOOL_DEPS])
+m4trace:configure.ac:49: -1- AC_SUBST_TRACE([LIBTOOL_DEPS])
+m4trace:configure.ac:49: -1- m4_pattern_allow([^LIBTOOL_DEPS$])
+m4trace:configure.ac:51: -1- AC_SUBST([AR])
+m4trace:configure.ac:51: -1- AC_SUBST_TRACE([AR])
+m4trace:configure.ac:51: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:52: -1- AC_SUBST([RM])
+m4trace:configure.ac:52: -1- AC_SUBST_TRACE([RM])
+m4trace:configure.ac:52: -1- m4_pattern_allow([^RM$])
+m4trace:configure.ac:53: -1- AC_SUBST([CP])
+m4trace:configure.ac:53: -1- AC_SUBST_TRACE([CP])
+m4trace:configure.ac:53: -1- m4_pattern_allow([^CP$])
+m4trace:configure.ac:54: -1- AC_SUBST([LN])
+m4trace:configure.ac:54: -1- AC_SUBST_TRACE([LN])
+m4trace:configure.ac:54: -1- m4_pattern_allow([^LN$])
+m4trace:configure.ac:55: -1- AC_SUBST([SED])
+m4trace:configure.ac:55: -1- AC_SUBST_TRACE([SED])
+m4trace:configure.ac:55: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:56: -1- AC_SUBST([MAKE])
+m4trace:configure.ac:56: -1- AC_SUBST_TRACE([MAKE])
+m4trace:configure.ac:56: -1- m4_pattern_allow([^MAKE$])
+m4trace:configure.ac:61: -1- AM_GNU_GETTEXT([external])
+m4trace:configure.ac:61: -1- AM_NLS
+m4trace:configure.ac:61: -1- AC_SUBST([USE_NLS])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([USE_NLS])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^USE_NLS$])
+m4trace:configure.ac:61: -1- AC_SUBST([MSGFMT])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([MSGFMT])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^MSGFMT$])
+m4trace:configure.ac:61: -1- AC_SUBST([GMSGFMT])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([GMSGFMT])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^GMSGFMT$])
+m4trace:configure.ac:61: -1- AC_SUBST([MSGFMT_015])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([MSGFMT_015])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^MSGFMT_015$])
+m4trace:configure.ac:61: -1- AC_SUBST([GMSGFMT_015])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([GMSGFMT_015])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^GMSGFMT_015$])
+m4trace:configure.ac:61: -1- AC_SUBST([XGETTEXT])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([XGETTEXT])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^XGETTEXT$])
+m4trace:configure.ac:61: -1- AC_SUBST([XGETTEXT_015])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([XGETTEXT_015])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^XGETTEXT_015$])
+m4trace:configure.ac:61: -1- AC_SUBST([MSGMERGE])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([MSGMERGE])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^MSGMERGE$])
+m4trace:configure.ac:61: -1- AC_SUBST([localedir])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([localedir])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.ac:61: -1- AC_REQUIRE_AUX_FILE([config.rpath])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:367: gt_INTL_MACOSX is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CFPREFERENCESCOPYAPPVALUE])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_CFPREFERENCESCOPYAPPVALUE$])
-m4trace:configure.ac:60: -1- AH_OUTPUT([HAVE_CFPREFERENCESCOPYAPPVALUE], [/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CFPREFERENCESCOPYAPPVALUE])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_CFPREFERENCESCOPYAPPVALUE$])
+m4trace:configure.ac:61: -1- AH_OUTPUT([HAVE_CFPREFERENCESCOPYAPPVALUE], [/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
    the CoreFoundation framework. */
 @%:@undef HAVE_CFPREFERENCESCOPYAPPVALUE])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:367: gt_INTL_MACOSX is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CFLOCALECOPYCURRENT])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_CFLOCALECOPYCURRENT$])
-m4trace:configure.ac:60: -1- AH_OUTPUT([HAVE_CFLOCALECOPYCURRENT], [/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- AC_DEFINE_TRACE_LITERAL([HAVE_CFLOCALECOPYCURRENT])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_CFLOCALECOPYCURRENT$])
+m4trace:configure.ac:61: -1- AH_OUTPUT([HAVE_CFLOCALECOPYCURRENT], [/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 @%:@undef HAVE_CFLOCALECOPYCURRENT])
-m4trace:configure.ac:60: -1- AC_SUBST([INTL_MACOSX_LIBS])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([INTL_MACOSX_LIBS])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^INTL_MACOSX_LIBS$])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.ac:61: -1- AC_SUBST([INTL_MACOSX_LIBS])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([INTL_MACOSX_LIBS])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^INTL_MACOSX_LIBS$])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/iconv.m4:20: AM_ICONV_LINK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/iconv.m4:20: AM_ICONV_LINK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ICONV])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_ICONV$])
-m4trace:configure.ac:60: -1- AH_OUTPUT([HAVE_ICONV], [/* Define if you have the iconv() function. */
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ICONV])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_ICONV$])
+m4trace:configure.ac:61: -1- AH_OUTPUT([HAVE_ICONV], [/* Define if you have the iconv() function. */
 @%:@undef HAVE_ICONV])
-m4trace:configure.ac:60: -1- AC_SUBST([LIBICONV])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([LIBICONV])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^LIBICONV$])
-m4trace:configure.ac:60: -1- AC_SUBST([LTLIBICONV])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([LTLIBICONV])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^LTLIBICONV$])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.ac:61: -1- AC_SUBST([LIBICONV])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([LIBICONV])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^LIBICONV$])
+m4trace:configure.ac:61: -1- AC_SUBST([LTLIBICONV])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([LTLIBICONV])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^LTLIBICONV$])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^ENABLE_NLS$])
-m4trace:configure.ac:60: -1- AH_OUTPUT([ENABLE_NLS], [/* Define to 1 if translation of program messages to the user\'s native
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_NLS])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^ENABLE_NLS$])
+m4trace:configure.ac:61: -1- AH_OUTPUT([ENABLE_NLS], [/* Define to 1 if translation of program messages to the user\'s native
    language is requested. */
 @%:@undef ENABLE_NLS])
-m4trace:configure.ac:60: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_GETTEXT$])
-m4trace:configure.ac:60: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */
+m4trace:configure.ac:61: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETTEXT])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_GETTEXT$])
+m4trace:configure.ac:61: -1- AH_OUTPUT([HAVE_GETTEXT], [/* Define if the GNU gettext() function is already present or preinstalled. */
 @%:@undef HAVE_GETTEXT])
-m4trace:configure.ac:60: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DCGETTEXT])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_DCGETTEXT$])
-m4trace:configure.ac:60: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define if the GNU dcgettext() function is already present or preinstalled.
+m4trace:configure.ac:61: -1- AC_DEFINE_TRACE_LITERAL([HAVE_DCGETTEXT])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_DCGETTEXT$])
+m4trace:configure.ac:61: -1- AH_OUTPUT([HAVE_DCGETTEXT], [/* Define if the GNU dcgettext() function is already present or preinstalled.
    */
 @%:@undef HAVE_DCGETTEXT])
-m4trace:configure.ac:60: -1- AC_SUBST([INTLLIBS])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([INTLLIBS])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^INTLLIBS$])
-m4trace:configure.ac:60: -1- AC_SUBST([LIBINTL])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([LIBINTL])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^LIBINTL$])
-m4trace:configure.ac:60: -1- AC_SUBST([LTLIBINTL])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([LTLIBINTL])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^LTLIBINTL$])
-m4trace:configure.ac:60: -1- AC_SUBST([POSUB])
-m4trace:configure.ac:60: -1- AC_SUBST_TRACE([POSUB])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^POSUB$])
-m4trace:configure.ac:83: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_DMALLOC])
-m4trace:configure.ac:83: -1- m4_pattern_allow([^ENABLE_DMALLOC$])
-m4trace:configure.ac:83: -1- AH_OUTPUT([ENABLE_DMALLOC], [/* Define enable dmalloc debugging */
+m4trace:configure.ac:61: -1- AC_SUBST([INTLLIBS])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([INTLLIBS])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^INTLLIBS$])
+m4trace:configure.ac:61: -1- AC_SUBST([LIBINTL])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([LIBINTL])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^LIBINTL$])
+m4trace:configure.ac:61: -1- AC_SUBST([LTLIBINTL])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([LTLIBINTL])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^LTLIBINTL$])
+m4trace:configure.ac:61: -1- AC_SUBST([POSUB])
+m4trace:configure.ac:61: -1- AC_SUBST_TRACE([POSUB])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^POSUB$])
+m4trace:configure.ac:84: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_DMALLOC])
+m4trace:configure.ac:84: -1- m4_pattern_allow([^ENABLE_DMALLOC$])
+m4trace:configure.ac:84: -1- AH_OUTPUT([ENABLE_DMALLOC], [/* Define enable dmalloc debugging */
 @%:@undef ENABLE_DMALLOC])
-m4trace:configure.ac:100: -1- AC_SUBST([localedir], ["$localedir"])
-m4trace:configure.ac:100: -1- AC_SUBST_TRACE([localedir])
-m4trace:configure.ac:100: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.ac:191: -1- AC_DEFINE_TRACE_LITERAL([DEBUG])
-m4trace:configure.ac:191: -1- m4_pattern_allow([^DEBUG$])
-m4trace:configure.ac:191: -1- AH_OUTPUT([DEBUG], [/* Compile in debugging */
+m4trace:configure.ac:101: -1- AC_SUBST([localedir], ["$localedir"])
+m4trace:configure.ac:101: -1- AC_SUBST_TRACE([localedir])
+m4trace:configure.ac:101: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.ac:192: -1- AC_DEFINE_TRACE_LITERAL([DEBUG])
+m4trace:configure.ac:192: -1- m4_pattern_allow([^DEBUG$])
+m4trace:configure.ac:192: -1- AH_OUTPUT([DEBUG], [/* Compile in debugging */
 @%:@undef DEBUG])
-m4trace:configure.ac:192: -1- AC_DEFINE_TRACE_LITERAL([DEBUGJOURNAL])
-m4trace:configure.ac:192: -1- m4_pattern_allow([^DEBUGJOURNAL$])
-m4trace:configure.ac:192: -1- AH_OUTPUT([DEBUGJOURNAL], [/* Display debug messages in journal */
+m4trace:configure.ac:193: -1- AC_DEFINE_TRACE_LITERAL([DEBUGJOURNAL])
+m4trace:configure.ac:193: -1- m4_pattern_allow([^DEBUGJOURNAL$])
+m4trace:configure.ac:193: -1- AH_OUTPUT([DEBUGJOURNAL], [/* Display debug messages in journal */
 @%:@undef DEBUGJOURNAL])
-m4trace:configure.ac:214: -1- AC_DEFINE_TRACE_LITERAL([MOUSE])
-m4trace:configure.ac:214: -1- m4_pattern_allow([^MOUSE$])
-m4trace:configure.ac:214: -1- AH_OUTPUT([MOUSE], [/* Compile in mouse support */
+m4trace:configure.ac:215: -1- AC_DEFINE_TRACE_LITERAL([MOUSE])
+m4trace:configure.ac:215: -1- m4_pattern_allow([^MOUSE$])
+m4trace:configure.ac:215: -1- AH_OUTPUT([MOUSE], [/* Compile in mouse support */
 @%:@undef MOUSE])
-m4trace:configure.ac:224: -1- AC_DEFINE_TRACE_LITERAL([USE_QUOTAS])
-m4trace:configure.ac:224: -1- m4_pattern_allow([^USE_QUOTAS$])
-m4trace:configure.ac:224: -1- AH_OUTPUT([USE_QUOTAS], [/* Compile in quota check on startup */
+m4trace:configure.ac:225: -1- AC_DEFINE_TRACE_LITERAL([USE_QUOTAS])
+m4trace:configure.ac:225: -1- m4_pattern_allow([^USE_QUOTAS$])
+m4trace:configure.ac:225: -1- AH_OUTPUT([USE_QUOTAS], [/* Compile in quota check on startup */
 @%:@undef USE_QUOTAS])
-m4trace:configure.ac:235: -1- AC_DEFINE_TRACE_LITERAL([NEVER_ALLOW_CHANGING_FROM])
-m4trace:configure.ac:235: -1- m4_pattern_allow([^NEVER_ALLOW_CHANGING_FROM$])
-m4trace:configure.ac:235: -1- AH_OUTPUT([NEVER_ALLOW_CHANGING_FROM], [/* Disallow users changing their From address */
+m4trace:configure.ac:236: -1- AC_DEFINE_TRACE_LITERAL([NEVER_ALLOW_CHANGING_FROM])
+m4trace:configure.ac:236: -1- m4_pattern_allow([^NEVER_ALLOW_CHANGING_FROM$])
+m4trace:configure.ac:236: -1- AH_OUTPUT([NEVER_ALLOW_CHANGING_FROM], [/* Disallow users changing their From address */
 @%:@undef NEVER_ALLOW_CHANGING_FROM])
-m4trace:configure.ac:243: -1- AC_DEFINE_TRACE_LITERAL([BACKGROUND_POST])
-m4trace:configure.ac:243: -1- m4_pattern_allow([^BACKGROUND_POST$])
-m4trace:configure.ac:243: -1- AH_OUTPUT([BACKGROUND_POST], [/* Enable background posting support */
+m4trace:configure.ac:244: -1- AC_DEFINE_TRACE_LITERAL([BACKGROUND_POST])
+m4trace:configure.ac:244: -1- m4_pattern_allow([^BACKGROUND_POST$])
+m4trace:configure.ac:244: -1- AH_OUTPUT([BACKGROUND_POST], [/* Enable background posting support */
 @%:@undef BACKGROUND_POST])
-m4trace:configure.ac:253: -1- AC_DEFINE_TRACE_LITERAL([KEYBOARD_LOCK])
-m4trace:configure.ac:253: -1- m4_pattern_allow([^KEYBOARD_LOCK$])
-m4trace:configure.ac:253: -1- AH_OUTPUT([KEYBOARD_LOCK], [/* Enable keyboard lock support */
+m4trace:configure.ac:254: -1- AC_DEFINE_TRACE_LITERAL([KEYBOARD_LOCK])
+m4trace:configure.ac:254: -1- m4_pattern_allow([^KEYBOARD_LOCK$])
+m4trace:configure.ac:254: -1- AH_OUTPUT([KEYBOARD_LOCK], [/* Enable keyboard lock support */
 @%:@undef KEYBOARD_LOCK])
-m4trace:configure.ac:263: -1- AC_DEFINE_TRACE_LITERAL([ENCODE_FROMS])
-m4trace:configure.ac:263: -1- m4_pattern_allow([^ENCODE_FROMS$])
-m4trace:configure.ac:263: -1- AH_OUTPUT([ENCODE_FROMS], [/* Enable From address encoding in sent messages */
+m4trace:configure.ac:264: -1- AC_DEFINE_TRACE_LITERAL([ENCODE_FROMS])
+m4trace:configure.ac:264: -1- m4_pattern_allow([^ENCODE_FROMS$])
+m4trace:configure.ac:264: -1- AH_OUTPUT([ENCODE_FROMS], [/* Enable From address encoding in sent messages */
 @%:@undef ENCODE_FROMS])
-m4trace:configure.ac:271: -1- AC_SUBST([SENDMAIL])
-m4trace:configure.ac:271: -1- AC_SUBST_TRACE([SENDMAIL])
-m4trace:configure.ac:271: -1- m4_pattern_allow([^SENDMAIL$])
-m4trace:configure.ac:271: -1- AC_SUBST([SENDMAIL])
-m4trace:configure.ac:271: -1- AC_SUBST_TRACE([SENDMAIL])
-m4trace:configure.ac:271: -1- m4_pattern_allow([^SENDMAIL$])
-m4trace:configure.ac:289: -1- AC_DEFINE_TRACE_LITERAL([SENDMAIL])
-m4trace:configure.ac:289: -1- m4_pattern_allow([^SENDMAIL$])
-m4trace:configure.ac:289: -1- AH_OUTPUT([SENDMAIL], [/* Local mail submission agent */
+m4trace:configure.ac:272: -1- AC_SUBST([SENDMAIL])
+m4trace:configure.ac:272: -1- AC_SUBST_TRACE([SENDMAIL])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^SENDMAIL$])
+m4trace:configure.ac:272: -1- AC_SUBST([SENDMAIL])
+m4trace:configure.ac:272: -1- AC_SUBST_TRACE([SENDMAIL])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^SENDMAIL$])
+m4trace:configure.ac:290: -1- AC_DEFINE_TRACE_LITERAL([SENDMAIL])
+m4trace:configure.ac:290: -1- m4_pattern_allow([^SENDMAIL$])
+m4trace:configure.ac:290: -1- AH_OUTPUT([SENDMAIL], [/* Local mail submission agent */
 @%:@undef SENDMAIL])
-m4trace:configure.ac:301: -1- AC_DEFINE_TRACE_LITERAL([SENDMAILFLAGS])
-m4trace:configure.ac:301: -1- m4_pattern_allow([^SENDMAILFLAGS$])
-m4trace:configure.ac:301: -1- AH_OUTPUT([SENDMAILFLAGS], [/* Local MSA flags for SMTP on stdin/stdout */
+m4trace:configure.ac:302: -1- AC_DEFINE_TRACE_LITERAL([SENDMAILFLAGS])
+m4trace:configure.ac:302: -1- m4_pattern_allow([^SENDMAILFLAGS$])
+m4trace:configure.ac:302: -1- AH_OUTPUT([SENDMAILFLAGS], [/* Local MSA flags for SMTP on stdin/stdout */
 @%:@undef SENDMAILFLAGS])
-m4trace:configure.ac:305: -1- AC_SUBST([NPA_PROG])
-m4trace:configure.ac:305: -1- AC_SUBST_TRACE([NPA_PROG])
-m4trace:configure.ac:305: -1- m4_pattern_allow([^NPA_PROG$])
-m4trace:configure.ac:305: -1- AC_SUBST([NPA_PROG])
-m4trace:configure.ac:305: -1- AC_SUBST_TRACE([NPA_PROG])
-m4trace:configure.ac:305: -1- m4_pattern_allow([^NPA_PROG$])
-m4trace:configure.ac:332: -1- AC_DEFINE_TRACE_LITERAL([SENDNEWS])
-m4trace:configure.ac:332: -1- m4_pattern_allow([^SENDNEWS$])
-m4trace:configure.ac:332: -1- AH_OUTPUT([SENDNEWS], [/* Posting agent to use when no nntp-servers defined */
+m4trace:configure.ac:306: -1- AC_SUBST([NPA_PROG])
+m4trace:configure.ac:306: -1- AC_SUBST_TRACE([NPA_PROG])
+m4trace:configure.ac:306: -1- m4_pattern_allow([^NPA_PROG$])
+m4trace:configure.ac:306: -1- AC_SUBST([NPA_PROG])
+m4trace:configure.ac:306: -1- AC_SUBST_TRACE([NPA_PROG])
+m4trace:configure.ac:306: -1- m4_pattern_allow([^NPA_PROG$])
+m4trace:configure.ac:333: -1- AC_DEFINE_TRACE_LITERAL([SENDNEWS])
+m4trace:configure.ac:333: -1- m4_pattern_allow([^SENDNEWS$])
+m4trace:configure.ac:333: -1- AH_OUTPUT([SENDNEWS], [/* Posting agent to use when no nntp-servers defined */
 @%:@undef SENDNEWS])
-m4trace:configure.ac:336: -1- AC_SUBST([PWPROG])
-m4trace:configure.ac:336: -1- AC_SUBST_TRACE([PWPROG])
-m4trace:configure.ac:336: -1- m4_pattern_allow([^PWPROG$])
-m4trace:configure.ac:336: -1- AC_SUBST([PWPROG])
-m4trace:configure.ac:336: -1- AC_SUBST_TRACE([PWPROG])
-m4trace:configure.ac:336: -1- m4_pattern_allow([^PWPROG$])
-m4trace:configure.ac:336: -1- AC_SUBST([PWPROG])
-m4trace:configure.ac:336: -1- AC_SUBST_TRACE([PWPROG])
-m4trace:configure.ac:336: -1- m4_pattern_allow([^PWPROG$])
-m4trace:configure.ac:354: -1- AC_DEFINE_TRACE_LITERAL([PASSWD_PROG])
-m4trace:configure.ac:354: -1- m4_pattern_allow([^PASSWD_PROG$])
-m4trace:configure.ac:354: -1- AH_OUTPUT([PASSWD_PROG], [/* Program users use to change their password */
+m4trace:configure.ac:337: -1- AC_SUBST([PWPROG])
+m4trace:configure.ac:337: -1- AC_SUBST_TRACE([PWPROG])
+m4trace:configure.ac:337: -1- m4_pattern_allow([^PWPROG$])
+m4trace:configure.ac:337: -1- AC_SUBST([PWPROG])
+m4trace:configure.ac:337: -1- AC_SUBST_TRACE([PWPROG])
+m4trace:configure.ac:337: -1- m4_pattern_allow([^PWPROG$])
+m4trace:configure.ac:337: -1- AC_SUBST([PWPROG])
+m4trace:configure.ac:337: -1- AC_SUBST_TRACE([PWPROG])
+m4trace:configure.ac:337: -1- m4_pattern_allow([^PWPROG$])
+m4trace:configure.ac:355: -1- AC_DEFINE_TRACE_LITERAL([PASSWD_PROG])
+m4trace:configure.ac:355: -1- m4_pattern_allow([^PASSWD_PROG$])
+m4trace:configure.ac:355: -1- AH_OUTPUT([PASSWD_PROG], [/* Program users use to change their password */
 @%:@undef PASSWD_PROG])
-m4trace:configure.ac:358: -1- AC_SUBST([SPELLPROG])
-m4trace:configure.ac:358: -1- AC_SUBST_TRACE([SPELLPROG])
-m4trace:configure.ac:358: -1- m4_pattern_allow([^SPELLPROG$])
-m4trace:configure.ac:358: -1- AC_SUBST([SPELLPROG])
-m4trace:configure.ac:358: -1- AC_SUBST_TRACE([SPELLPROG])
-m4trace:configure.ac:358: -1- m4_pattern_allow([^SPELLPROG$])
-m4trace:configure.ac:358: -1- AC_SUBST([SPELLPROG])
-m4trace:configure.ac:358: -1- AC_SUBST_TRACE([SPELLPROG])
-m4trace:configure.ac:358: -1- m4_pattern_allow([^SPELLPROG$])
-m4trace:configure.ac:379: -1- AC_SUBST([alpine_simple_spellcheck])
-m4trace:configure.ac:379: -1- AC_SUBST_TRACE([alpine_simple_spellcheck])
-m4trace:configure.ac:379: -1- m4_pattern_allow([^alpine_simple_spellcheck$])
-m4trace:configure.ac:398: -1- AC_SUBST([ISPELLPROG])
-m4trace:configure.ac:398: -1- AC_SUBST_TRACE([ISPELLPROG])
-m4trace:configure.ac:398: -1- m4_pattern_allow([^ISPELLPROG$])
-m4trace:configure.ac:398: -1- AC_SUBST([ISPELLPROG])
-m4trace:configure.ac:398: -1- AC_SUBST_TRACE([ISPELLPROG])
-m4trace:configure.ac:398: -1- m4_pattern_allow([^ISPELLPROG$])
-m4trace:configure.ac:416: -1- AC_SUBST([alpine_interactive_spellcheck])
-m4trace:configure.ac:416: -1- AC_SUBST_TRACE([alpine_interactive_spellcheck])
-m4trace:configure.ac:416: -1- m4_pattern_allow([^alpine_interactive_spellcheck$])
-m4trace:configure.ac:429: -1- AC_DEFINE_TRACE_LITERAL([DF_VAR_SPELLER])
-m4trace:configure.ac:429: -1- m4_pattern_allow([^DF_VAR_SPELLER$])
-m4trace:configure.ac:429: -1- AH_OUTPUT([DF_VAR_SPELLER], [/* Interactive, filewise spell checker */
+m4trace:configure.ac:359: -1- AC_SUBST([SPELLPROG])
+m4trace:configure.ac:359: -1- AC_SUBST_TRACE([SPELLPROG])
+m4trace:configure.ac:359: -1- m4_pattern_allow([^SPELLPROG$])
+m4trace:configure.ac:359: -1- AC_SUBST([SPELLPROG])
+m4trace:configure.ac:359: -1- AC_SUBST_TRACE([SPELLPROG])
+m4trace:configure.ac:359: -1- m4_pattern_allow([^SPELLPROG$])
+m4trace:configure.ac:359: -1- AC_SUBST([SPELLPROG])
+m4trace:configure.ac:359: -1- AC_SUBST_TRACE([SPELLPROG])
+m4trace:configure.ac:359: -1- m4_pattern_allow([^SPELLPROG$])
+m4trace:configure.ac:380: -1- AC_SUBST([alpine_simple_spellcheck])
+m4trace:configure.ac:380: -1- AC_SUBST_TRACE([alpine_simple_spellcheck])
+m4trace:configure.ac:380: -1- m4_pattern_allow([^alpine_simple_spellcheck$])
+m4trace:configure.ac:399: -1- AC_SUBST([ISPELLPROG])
+m4trace:configure.ac:399: -1- AC_SUBST_TRACE([ISPELLPROG])
+m4trace:configure.ac:399: -1- m4_pattern_allow([^ISPELLPROG$])
+m4trace:configure.ac:399: -1- AC_SUBST([ISPELLPROG])
+m4trace:configure.ac:399: -1- AC_SUBST_TRACE([ISPELLPROG])
+m4trace:configure.ac:399: -1- m4_pattern_allow([^ISPELLPROG$])
+m4trace:configure.ac:417: -1- AC_SUBST([alpine_interactive_spellcheck])
+m4trace:configure.ac:417: -1- AC_SUBST_TRACE([alpine_interactive_spellcheck])
+m4trace:configure.ac:417: -1- m4_pattern_allow([^alpine_interactive_spellcheck$])
+m4trace:configure.ac:430: -1- AC_DEFINE_TRACE_LITERAL([DF_VAR_SPELLER])
+m4trace:configure.ac:430: -1- m4_pattern_allow([^DF_VAR_SPELLER$])
+m4trace:configure.ac:430: -1- AH_OUTPUT([DF_VAR_SPELLER], [/* Interactive, filewise spell checker */
 @%:@undef DF_VAR_SPELLER])
-m4trace:configure.ac:435: -1- AC_DEFINE_TRACE_LITERAL([SPELLER])
-m4trace:configure.ac:435: -1- m4_pattern_allow([^SPELLER$])
-m4trace:configure.ac:435: -1- AH_OUTPUT([SPELLER], [/* Simple spell checker: reads stdin, emits misspellings on stdout */
+m4trace:configure.ac:436: -1- AC_DEFINE_TRACE_LITERAL([SPELLER])
+m4trace:configure.ac:436: -1- m4_pattern_allow([^SPELLER$])
+m4trace:configure.ac:436: -1- AH_OUTPUT([SPELLER], [/* Simple spell checker: reads stdin, emits misspellings on stdout */
 @%:@undef SPELLER])
-m4trace:configure.ac:458: -1- AC_DEFINE_TRACE_LITERAL([SYSTEM_PINERC])
-m4trace:configure.ac:458: -1- m4_pattern_allow([^SYSTEM_PINERC$])
-m4trace:configure.ac:458: -1- AH_OUTPUT([SYSTEM_PINERC], [/* System pinerc */
+m4trace:configure.ac:459: -1- AC_DEFINE_TRACE_LITERAL([SYSTEM_PINERC])
+m4trace:configure.ac:459: -1- m4_pattern_allow([^SYSTEM_PINERC$])
+m4trace:configure.ac:459: -1- AH_OUTPUT([SYSTEM_PINERC], [/* System pinerc */
 @%:@undef SYSTEM_PINERC])
-m4trace:configure.ac:481: -1- AC_DEFINE_TRACE_LITERAL([SYSTEM_PINERC_FIXED])
-m4trace:configure.ac:481: -1- m4_pattern_allow([^SYSTEM_PINERC_FIXED$])
-m4trace:configure.ac:481: -1- AH_OUTPUT([SYSTEM_PINERC_FIXED], [/* System fixed pinerc */
+m4trace:configure.ac:482: -1- AC_DEFINE_TRACE_LITERAL([SYSTEM_PINERC_FIXED])
+m4trace:configure.ac:482: -1- m4_pattern_allow([^SYSTEM_PINERC_FIXED$])
+m4trace:configure.ac:482: -1- AH_OUTPUT([SYSTEM_PINERC_FIXED], [/* System fixed pinerc */
 @%:@undef SYSTEM_PINERC_FIXED])
-m4trace:configure.ac:505: -1- AC_DEFINE_TRACE_LITERAL([SYSTEM_PINE_INFO_PATH])
-m4trace:configure.ac:505: -1- m4_pattern_allow([^SYSTEM_PINE_INFO_PATH$])
-m4trace:configure.ac:505: -1- AH_OUTPUT([SYSTEM_PINE_INFO_PATH], [/* Local Support Info File */
+m4trace:configure.ac:506: -1- AC_DEFINE_TRACE_LITERAL([SYSTEM_PINE_INFO_PATH])
+m4trace:configure.ac:506: -1- m4_pattern_allow([^SYSTEM_PINE_INFO_PATH$])
+m4trace:configure.ac:506: -1- AH_OUTPUT([SYSTEM_PINE_INFO_PATH], [/* Local Support Info File */
 @%:@undef SYSTEM_PINE_INFO_PATH])
-m4trace:configure.ac:537: -1- AC_DEFINE_TRACE_LITERAL([DF_MAILCHECK])
-m4trace:configure.ac:537: -1- m4_pattern_allow([^DF_MAILCHECK$])
-m4trace:configure.ac:537: -1- AH_OUTPUT([DF_MAILCHECK], [/* Default configuration value */
+m4trace:configure.ac:538: -1- AC_DEFINE_TRACE_LITERAL([DF_MAILCHECK])
+m4trace:configure.ac:538: -1- m4_pattern_allow([^DF_MAILCHECK$])
+m4trace:configure.ac:538: -1- AH_OUTPUT([DF_MAILCHECK], [/* Default configuration value */
 @%:@undef DF_MAILCHECK])
-m4trace:configure.ac:538: -1- AC_DEFINE_TRACE_LITERAL([CHECK_POINT_TIME])
-m4trace:configure.ac:538: -1- m4_pattern_allow([^CHECK_POINT_TIME$])
-m4trace:configure.ac:538: -1- AH_OUTPUT([CHECK_POINT_TIME], [/* Default configuration value */
+m4trace:configure.ac:539: -1- AC_DEFINE_TRACE_LITERAL([CHECK_POINT_TIME])
+m4trace:configure.ac:539: -1- m4_pattern_allow([^CHECK_POINT_TIME$])
+m4trace:configure.ac:539: -1- AH_OUTPUT([CHECK_POINT_TIME], [/* Default configuration value */
 @%:@undef CHECK_POINT_TIME])
-m4trace:configure.ac:539: -1- AC_DEFINE_TRACE_LITERAL([CHECK_POINT_FREQ])
-m4trace:configure.ac:539: -1- m4_pattern_allow([^CHECK_POINT_FREQ$])
-m4trace:configure.ac:539: -1- AH_OUTPUT([CHECK_POINT_FREQ], [/* Default configuration value */
+m4trace:configure.ac:540: -1- AC_DEFINE_TRACE_LITERAL([CHECK_POINT_FREQ])
+m4trace:configure.ac:540: -1- m4_pattern_allow([^CHECK_POINT_FREQ$])
+m4trace:configure.ac:540: -1- AH_OUTPUT([CHECK_POINT_FREQ], [/* Default configuration value */
 @%:@undef CHECK_POINT_FREQ])
-m4trace:configure.ac:540: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_LINES_ON_TERMINAL])
-m4trace:configure.ac:540: -1- m4_pattern_allow([^DEFAULT_LINES_ON_TERMINAL$])
-m4trace:configure.ac:540: -1- AH_OUTPUT([DEFAULT_LINES_ON_TERMINAL], [/* Default configuration value */
+m4trace:configure.ac:541: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_LINES_ON_TERMINAL])
+m4trace:configure.ac:541: -1- m4_pattern_allow([^DEFAULT_LINES_ON_TERMINAL$])
+m4trace:configure.ac:541: -1- AH_OUTPUT([DEFAULT_LINES_ON_TERMINAL], [/* Default configuration value */
 @%:@undef DEFAULT_LINES_ON_TERMINAL])
-m4trace:configure.ac:541: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_COLUMNS_ON_TERMINAL])
-m4trace:configure.ac:541: -1- m4_pattern_allow([^DEFAULT_COLUMNS_ON_TERMINAL$])
-m4trace:configure.ac:541: -1- AH_OUTPUT([DEFAULT_COLUMNS_ON_TERMINAL], [/* Default configuration value */
+m4trace:configure.ac:542: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_COLUMNS_ON_TERMINAL])
+m4trace:configure.ac:542: -1- m4_pattern_allow([^DEFAULT_COLUMNS_ON_TERMINAL$])
+m4trace:configure.ac:542: -1- AH_OUTPUT([DEFAULT_COLUMNS_ON_TERMINAL], [/* Default configuration value */
 @%:@undef DEFAULT_COLUMNS_ON_TERMINAL])
-m4trace:configure.ac:542: -1- AC_DEFINE_TRACE_LITERAL([MAX_SCREEN_ROWS])
-m4trace:configure.ac:542: -1- m4_pattern_allow([^MAX_SCREEN_ROWS$])
-m4trace:configure.ac:542: -1- AH_OUTPUT([MAX_SCREEN_ROWS], [/* Default configuration value */
+m4trace:configure.ac:543: -1- AC_DEFINE_TRACE_LITERAL([MAX_SCREEN_ROWS])
+m4trace:configure.ac:543: -1- m4_pattern_allow([^MAX_SCREEN_ROWS$])
+m4trace:configure.ac:543: -1- AH_OUTPUT([MAX_SCREEN_ROWS], [/* Default configuration value */
 @%:@undef MAX_SCREEN_ROWS])
-m4trace:configure.ac:543: -1- AC_DEFINE_TRACE_LITERAL([MAX_SCREEN_COLS])
-m4trace:configure.ac:543: -1- m4_pattern_allow([^MAX_SCREEN_COLS$])
-m4trace:configure.ac:543: -1- AH_OUTPUT([MAX_SCREEN_COLS], [/* Default configuration value */
+m4trace:configure.ac:544: -1- AC_DEFINE_TRACE_LITERAL([MAX_SCREEN_COLS])
+m4trace:configure.ac:544: -1- m4_pattern_allow([^MAX_SCREEN_COLS$])
+m4trace:configure.ac:544: -1- AH_OUTPUT([MAX_SCREEN_COLS], [/* Default configuration value */
 @%:@undef MAX_SCREEN_COLS])
-m4trace:configure.ac:544: -1- AC_DEFINE_TRACE_LITERAL([DF_FILLCOL])
-m4trace:configure.ac:544: -1- m4_pattern_allow([^DF_FILLCOL$])
-m4trace:configure.ac:544: -1- AH_OUTPUT([DF_FILLCOL], [/* Default configuration value */
+m4trace:configure.ac:545: -1- AC_DEFINE_TRACE_LITERAL([DF_FILLCOL])
+m4trace:configure.ac:545: -1- m4_pattern_allow([^DF_FILLCOL$])
+m4trace:configure.ac:545: -1- AH_OUTPUT([DF_FILLCOL], [/* Default configuration value */
 @%:@undef DF_FILLCOL])
-m4trace:configure.ac:545: -1- AC_DEFINE_TRACE_LITERAL([MAX_FILLCOL])
-m4trace:configure.ac:545: -1- m4_pattern_allow([^MAX_FILLCOL$])
-m4trace:configure.ac:545: -1- AH_OUTPUT([MAX_FILLCOL], [/* Default configuration value */
+m4trace:configure.ac:546: -1- AC_DEFINE_TRACE_LITERAL([MAX_FILLCOL])
+m4trace:configure.ac:546: -1- m4_pattern_allow([^MAX_FILLCOL$])
+m4trace:configure.ac:546: -1- AH_OUTPUT([MAX_FILLCOL], [/* Default configuration value */
 @%:@undef MAX_FILLCOL])
-m4trace:configure.ac:546: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_DEBUG])
-m4trace:configure.ac:546: -1- m4_pattern_allow([^DEFAULT_DEBUG$])
-m4trace:configure.ac:546: -1- AH_OUTPUT([DEFAULT_DEBUG], [/* Default configuration value */
+m4trace:configure.ac:547: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_DEBUG])
+m4trace:configure.ac:547: -1- m4_pattern_allow([^DEFAULT_DEBUG$])
+m4trace:configure.ac:547: -1- AH_OUTPUT([DEFAULT_DEBUG], [/* Default configuration value */
 @%:@undef DEFAULT_DEBUG])
-m4trace:configure.ac:547: -1- AC_DEFINE_TRACE_LITERAL([NUMDEBUGFILES])
-m4trace:configure.ac:547: -1- m4_pattern_allow([^NUMDEBUGFILES$])
-m4trace:configure.ac:547: -1- AH_OUTPUT([NUMDEBUGFILES], [/* Default configuration value */
+m4trace:configure.ac:548: -1- AC_DEFINE_TRACE_LITERAL([NUMDEBUGFILES])
+m4trace:configure.ac:548: -1- m4_pattern_allow([^NUMDEBUGFILES$])
+m4trace:configure.ac:548: -1- AH_OUTPUT([NUMDEBUGFILES], [/* Default configuration value */
 @%:@undef NUMDEBUGFILES])
-m4trace:configure.ac:548: -1- AC_DEFINE_TRACE_LITERAL([DEBUGFILE])
-m4trace:configure.ac:548: -1- m4_pattern_allow([^DEBUGFILE$])
-m4trace:configure.ac:548: -1- AH_OUTPUT([DEBUGFILE], [/* Default configuration value */
+m4trace:configure.ac:549: -1- AC_DEFINE_TRACE_LITERAL([DEBUGFILE])
+m4trace:configure.ac:549: -1- m4_pattern_allow([^DEBUGFILE$])
+m4trace:configure.ac:549: -1- AH_OUTPUT([DEBUGFILE], [/* Default configuration value */
 @%:@undef DEBUGFILE])
-m4trace:configure.ac:549: -1- AC_DEFINE_TRACE_LITERAL([FORWARDED_FLAG])
-m4trace:configure.ac:549: -1- m4_pattern_allow([^FORWARDED_FLAG$])
-m4trace:configure.ac:549: -1- AH_OUTPUT([FORWARDED_FLAG], [/* Default configuration value */
+m4trace:configure.ac:550: -1- AC_DEFINE_TRACE_LITERAL([FORWARDED_FLAG])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^FORWARDED_FLAG$])
+m4trace:configure.ac:550: -1- AH_OUTPUT([FORWARDED_FLAG], [/* Default configuration value */
 @%:@undef FORWARDED_FLAG])
-m4trace:configure.ac:550: -1- AC_DEFINE_TRACE_LITERAL([DF_OVERLAP])
-m4trace:configure.ac:550: -1- m4_pattern_allow([^DF_OVERLAP$])
-m4trace:configure.ac:550: -1- AH_OUTPUT([DF_OVERLAP], [/* Default configuration value */
+m4trace:configure.ac:551: -1- AC_DEFINE_TRACE_LITERAL([DF_OVERLAP])
+m4trace:configure.ac:551: -1- m4_pattern_allow([^DF_OVERLAP$])
+m4trace:configure.ac:551: -1- AH_OUTPUT([DF_OVERLAP], [/* Default configuration value */
 @%:@undef DF_OVERLAP])
-m4trace:configure.ac:551: -1- AC_DEFINE_TRACE_LITERAL([DF_MARGIN])
-m4trace:configure.ac:551: -1- m4_pattern_allow([^DF_MARGIN$])
-m4trace:configure.ac:551: -1- AH_OUTPUT([DF_MARGIN], [/* Default configuration value */
+m4trace:configure.ac:552: -1- AC_DEFINE_TRACE_LITERAL([DF_MARGIN])
+m4trace:configure.ac:552: -1- m4_pattern_allow([^DF_MARGIN$])
+m4trace:configure.ac:552: -1- AH_OUTPUT([DF_MARGIN], [/* Default configuration value */
 @%:@undef DF_MARGIN])
-m4trace:configure.ac:552: -1- AC_DEFINE_TRACE_LITERAL([DF_DEFAULT_FCC])
-m4trace:configure.ac:552: -1- m4_pattern_allow([^DF_DEFAULT_FCC$])
-m4trace:configure.ac:552: -1- AH_OUTPUT([DF_DEFAULT_FCC], [/* Default configuration value */
+m4trace:configure.ac:553: -1- AC_DEFINE_TRACE_LITERAL([DF_DEFAULT_FCC])
+m4trace:configure.ac:553: -1- m4_pattern_allow([^DF_DEFAULT_FCC$])
+m4trace:configure.ac:553: -1- AH_OUTPUT([DF_DEFAULT_FCC], [/* Default configuration value */
 @%:@undef DF_DEFAULT_FCC])
-m4trace:configure.ac:553: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_SAVE])
-m4trace:configure.ac:553: -1- m4_pattern_allow([^DEFAULT_SAVE$])
-m4trace:configure.ac:553: -1- AH_OUTPUT([DEFAULT_SAVE], [/* Default configuration value */
+m4trace:configure.ac:554: -1- AC_DEFINE_TRACE_LITERAL([DEFAULT_SAVE])
+m4trace:configure.ac:554: -1- m4_pattern_allow([^DEFAULT_SAVE$])
+m4trace:configure.ac:554: -1- AH_OUTPUT([DEFAULT_SAVE], [/* Default configuration value */
 @%:@undef DEFAULT_SAVE])
-m4trace:configure.ac:554: -1- AC_DEFINE_TRACE_LITERAL([POSTPONED_MAIL])
-m4trace:configure.ac:554: -1- m4_pattern_allow([^POSTPONED_MAIL$])
-m4trace:configure.ac:554: -1- AH_OUTPUT([POSTPONED_MAIL], [/* Default configuration value */
+m4trace:configure.ac:555: -1- AC_DEFINE_TRACE_LITERAL([POSTPONED_MAIL])
+m4trace:configure.ac:555: -1- m4_pattern_allow([^POSTPONED_MAIL$])
+m4trace:configure.ac:555: -1- AH_OUTPUT([POSTPONED_MAIL], [/* Default configuration value */
 @%:@undef POSTPONED_MAIL])
-m4trace:configure.ac:555: -1- AC_DEFINE_TRACE_LITERAL([POSTPONED_MSGS])
-m4trace:configure.ac:555: -1- m4_pattern_allow([^POSTPONED_MSGS$])
-m4trace:configure.ac:555: -1- AH_OUTPUT([POSTPONED_MSGS], [/* Default configuration value */
+m4trace:configure.ac:556: -1- AC_DEFINE_TRACE_LITERAL([POSTPONED_MSGS])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^POSTPONED_MSGS$])
+m4trace:configure.ac:556: -1- AH_OUTPUT([POSTPONED_MSGS], [/* Default configuration value */
 @%:@undef POSTPONED_MSGS])
-m4trace:configure.ac:556: -1- AC_DEFINE_TRACE_LITERAL([TRASH_FOLDER])
-m4trace:configure.ac:556: -1- m4_pattern_allow([^TRASH_FOLDER$])
-m4trace:configure.ac:556: -1- AH_OUTPUT([TRASH_FOLDER], [/* Default configuration value */
+m4trace:configure.ac:557: -1- AC_DEFINE_TRACE_LITERAL([TRASH_FOLDER])
+m4trace:configure.ac:557: -1- m4_pattern_allow([^TRASH_FOLDER$])
+m4trace:configure.ac:557: -1- AH_OUTPUT([TRASH_FOLDER], [/* Default configuration value */
 @%:@undef TRASH_FOLDER])
-m4trace:configure.ac:557: -1- AC_DEFINE_TRACE_LITERAL([INTERRUPTED_MAIL])
-m4trace:configure.ac:557: -1- m4_pattern_allow([^INTERRUPTED_MAIL$])
-m4trace:configure.ac:557: -1- AH_OUTPUT([INTERRUPTED_MAIL], [/* Default configuration value */
+m4trace:configure.ac:558: -1- AC_DEFINE_TRACE_LITERAL([INTERRUPTED_MAIL])
+m4trace:configure.ac:558: -1- m4_pattern_allow([^INTERRUPTED_MAIL$])
+m4trace:configure.ac:558: -1- AH_OUTPUT([INTERRUPTED_MAIL], [/* Default configuration value */
 @%:@undef INTERRUPTED_MAIL])
-m4trace:configure.ac:558: -1- AC_DEFINE_TRACE_LITERAL([DEADLETTER])
-m4trace:configure.ac:558: -1- m4_pattern_allow([^DEADLETTER$])
-m4trace:configure.ac:558: -1- AH_OUTPUT([DEADLETTER], [/* Default configuration value */
+m4trace:configure.ac:559: -1- AC_DEFINE_TRACE_LITERAL([DEADLETTER])
+m4trace:configure.ac:559: -1- m4_pattern_allow([^DEADLETTER$])
+m4trace:configure.ac:559: -1- AH_OUTPUT([DEADLETTER], [/* Default configuration value */
 @%:@undef DEADLETTER])
-m4trace:configure.ac:559: -1- AC_DEFINE_TRACE_LITERAL([DF_MAIL_DIRECTORY])
-m4trace:configure.ac:559: -1- m4_pattern_allow([^DF_MAIL_DIRECTORY$])
-m4trace:configure.ac:559: -1- AH_OUTPUT([DF_MAIL_DIRECTORY], [/* Default configuration value */
+m4trace:configure.ac:560: -1- AC_DEFINE_TRACE_LITERAL([DF_MAIL_DIRECTORY])
+m4trace:configure.ac:560: -1- m4_pattern_allow([^DF_MAIL_DIRECTORY$])
+m4trace:configure.ac:560: -1- AH_OUTPUT([DF_MAIL_DIRECTORY], [/* Default configuration value */
 @%:@undef DF_MAIL_DIRECTORY])
-m4trace:configure.ac:560: -1- AC_DEFINE_TRACE_LITERAL([INBOX_NAME])
-m4trace:configure.ac:560: -1- m4_pattern_allow([^INBOX_NAME$])
-m4trace:configure.ac:560: -1- AH_OUTPUT([INBOX_NAME], [/* Default configuration value */
+m4trace:configure.ac:561: -1- AC_DEFINE_TRACE_LITERAL([INBOX_NAME])
+m4trace:configure.ac:561: -1- m4_pattern_allow([^INBOX_NAME$])
+m4trace:configure.ac:561: -1- AH_OUTPUT([INBOX_NAME], [/* Default configuration value */
 @%:@undef INBOX_NAME])
-m4trace:configure.ac:561: -1- AC_DEFINE_TRACE_LITERAL([DF_SIGNATURE_FILE])
-m4trace:configure.ac:561: -1- m4_pattern_allow([^DF_SIGNATURE_FILE$])
-m4trace:configure.ac:561: -1- AH_OUTPUT([DF_SIGNATURE_FILE], [/* Default configuration value */
+m4trace:configure.ac:562: -1- AC_DEFINE_TRACE_LITERAL([DF_SIGNATURE_FILE])
+m4trace:configure.ac:562: -1- m4_pattern_allow([^DF_SIGNATURE_FILE$])
+m4trace:configure.ac:562: -1- AH_OUTPUT([DF_SIGNATURE_FILE], [/* Default configuration value */
 @%:@undef DF_SIGNATURE_FILE])
-m4trace:configure.ac:562: -1- AC_DEFINE_TRACE_LITERAL([DF_ELM_STYLE_SAVE])
-m4trace:configure.ac:562: -1- m4_pattern_allow([^DF_ELM_STYLE_SAVE$])
-m4trace:configure.ac:562: -1- AH_OUTPUT([DF_ELM_STYLE_SAVE], [/* Default configuration value */
+m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([DF_ELM_STYLE_SAVE])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^DF_ELM_STYLE_SAVE$])
+m4trace:configure.ac:563: -1- AH_OUTPUT([DF_ELM_STYLE_SAVE], [/* Default configuration value */
 @%:@undef DF_ELM_STYLE_SAVE])
-m4trace:configure.ac:563: -1- AC_DEFINE_TRACE_LITERAL([DF_HEADER_IN_REPLY])
-m4trace:configure.ac:563: -1- m4_pattern_allow([^DF_HEADER_IN_REPLY$])
-m4trace:configure.ac:563: -1- AH_OUTPUT([DF_HEADER_IN_REPLY], [/* Default configuration value */
+m4trace:configure.ac:564: -1- AC_DEFINE_TRACE_LITERAL([DF_HEADER_IN_REPLY])
+m4trace:configure.ac:564: -1- m4_pattern_allow([^DF_HEADER_IN_REPLY$])
+m4trace:configure.ac:564: -1- AH_OUTPUT([DF_HEADER_IN_REPLY], [/* Default configuration value */
 @%:@undef DF_HEADER_IN_REPLY])
-m4trace:configure.ac:564: -1- AC_DEFINE_TRACE_LITERAL([DF_OLD_STYLE_REPLY])
-m4trace:configure.ac:564: -1- m4_pattern_allow([^DF_OLD_STYLE_REPLY$])
-m4trace:configure.ac:564: -1- AH_OUTPUT([DF_OLD_STYLE_REPLY], [/* Default configuration value */
+m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([DF_OLD_STYLE_REPLY])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^DF_OLD_STYLE_REPLY$])
+m4trace:configure.ac:565: -1- AH_OUTPUT([DF_OLD_STYLE_REPLY], [/* Default configuration value */
 @%:@undef DF_OLD_STYLE_REPLY])
-m4trace:configure.ac:565: -1- AC_DEFINE_TRACE_LITERAL([DF_USE_ONLY_DOMAIN_NAME])
-m4trace:configure.ac:565: -1- m4_pattern_allow([^DF_USE_ONLY_DOMAIN_NAME$])
-m4trace:configure.ac:565: -1- AH_OUTPUT([DF_USE_ONLY_DOMAIN_NAME], [/* Default configuration value */
+m4trace:configure.ac:566: -1- AC_DEFINE_TRACE_LITERAL([DF_USE_ONLY_DOMAIN_NAME])
+m4trace:configure.ac:566: -1- m4_pattern_allow([^DF_USE_ONLY_DOMAIN_NAME$])
+m4trace:configure.ac:566: -1- AH_OUTPUT([DF_USE_ONLY_DOMAIN_NAME], [/* Default configuration value */
 @%:@undef DF_USE_ONLY_DOMAIN_NAME])
-m4trace:configure.ac:566: -1- AC_DEFINE_TRACE_LITERAL([DF_SAVE_BY_SENDER])
-m4trace:configure.ac:566: -1- m4_pattern_allow([^DF_SAVE_BY_SENDER$])
-m4trace:configure.ac:566: -1- AH_OUTPUT([DF_SAVE_BY_SENDER], [/* Default configuration value */
+m4trace:configure.ac:567: -1- AC_DEFINE_TRACE_LITERAL([DF_SAVE_BY_SENDER])
+m4trace:configure.ac:567: -1- m4_pattern_allow([^DF_SAVE_BY_SENDER$])
+m4trace:configure.ac:567: -1- AH_OUTPUT([DF_SAVE_BY_SENDER], [/* Default configuration value */
 @%:@undef DF_SAVE_BY_SENDER])
-m4trace:configure.ac:567: -1- AC_DEFINE_TRACE_LITERAL([DF_SORT_KEY])
-m4trace:configure.ac:567: -1- m4_pattern_allow([^DF_SORT_KEY$])
-m4trace:configure.ac:567: -1- AH_OUTPUT([DF_SORT_KEY], [/* Default configuration value */
+m4trace:configure.ac:568: -1- AC_DEFINE_TRACE_LITERAL([DF_SORT_KEY])
+m4trace:configure.ac:568: -1- m4_pattern_allow([^DF_SORT_KEY$])
+m4trace:configure.ac:568: -1- AH_OUTPUT([DF_SORT_KEY], [/* Default configuration value */
 @%:@undef DF_SORT_KEY])
-m4trace:configure.ac:568: -1- AC_DEFINE_TRACE_LITERAL([DF_AB_SORT_RULE])
-m4trace:configure.ac:568: -1- m4_pattern_allow([^DF_AB_SORT_RULE$])
-m4trace:configure.ac:568: -1- AH_OUTPUT([DF_AB_SORT_RULE], [/* Default configuration value */
+m4trace:configure.ac:569: -1- AC_DEFINE_TRACE_LITERAL([DF_AB_SORT_RULE])
+m4trace:configure.ac:569: -1- m4_pattern_allow([^DF_AB_SORT_RULE$])
+m4trace:configure.ac:569: -1- AH_OUTPUT([DF_AB_SORT_RULE], [/* Default configuration value */
 @%:@undef DF_AB_SORT_RULE])
-m4trace:configure.ac:569: -1- AC_DEFINE_TRACE_LITERAL([DF_FLD_SORT_RULE])
-m4trace:configure.ac:569: -1- m4_pattern_allow([^DF_FLD_SORT_RULE$])
-m4trace:configure.ac:569: -1- AH_OUTPUT([DF_FLD_SORT_RULE], [/* Default configuration value */
+m4trace:configure.ac:570: -1- AC_DEFINE_TRACE_LITERAL([DF_FLD_SORT_RULE])
+m4trace:configure.ac:570: -1- m4_pattern_allow([^DF_FLD_SORT_RULE$])
+m4trace:configure.ac:570: -1- AH_OUTPUT([DF_FLD_SORT_RULE], [/* Default configuration value */
 @%:@undef DF_FLD_SORT_RULE])
-m4trace:configure.ac:570: -1- AC_DEFINE_TRACE_LITERAL([DF_SAVED_MSG_NAME_RULE])
-m4trace:configure.ac:570: -1- m4_pattern_allow([^DF_SAVED_MSG_NAME_RULE$])
-m4trace:configure.ac:570: -1- AH_OUTPUT([DF_SAVED_MSG_NAME_RULE], [/* Default configuration value */
+m4trace:configure.ac:571: -1- AC_DEFINE_TRACE_LITERAL([DF_SAVED_MSG_NAME_RULE])
+m4trace:configure.ac:571: -1- m4_pattern_allow([^DF_SAVED_MSG_NAME_RULE$])
+m4trace:configure.ac:571: -1- AH_OUTPUT([DF_SAVED_MSG_NAME_RULE], [/* Default configuration value */
 @%:@undef DF_SAVED_MSG_NAME_RULE])
-m4trace:configure.ac:571: -1- AC_DEFINE_TRACE_LITERAL([DF_FCC_RULE])
-m4trace:configure.ac:571: -1- m4_pattern_allow([^DF_FCC_RULE$])
-m4trace:configure.ac:571: -1- AH_OUTPUT([DF_FCC_RULE], [/* Default configuration value */
+m4trace:configure.ac:572: -1- AC_DEFINE_TRACE_LITERAL([DF_FCC_RULE])
+m4trace:configure.ac:572: -1- m4_pattern_allow([^DF_FCC_RULE$])
+m4trace:configure.ac:572: -1- AH_OUTPUT([DF_FCC_RULE], [/* Default configuration value */
 @%:@undef DF_FCC_RULE])
-m4trace:configure.ac:572: -1- AC_DEFINE_TRACE_LITERAL([DF_STANDARD_PRINTER])
-m4trace:configure.ac:572: -1- m4_pattern_allow([^DF_STANDARD_PRINTER$])
-m4trace:configure.ac:572: -1- AH_OUTPUT([DF_STANDARD_PRINTER], [/* Default configuration value */
+m4trace:configure.ac:573: -1- AC_DEFINE_TRACE_LITERAL([DF_STANDARD_PRINTER])
+m4trace:configure.ac:573: -1- m4_pattern_allow([^DF_STANDARD_PRINTER$])
+m4trace:configure.ac:573: -1- AH_OUTPUT([DF_STANDARD_PRINTER], [/* Default configuration value */
 @%:@undef DF_STANDARD_PRINTER])
-m4trace:configure.ac:573: -1- AC_DEFINE_TRACE_LITERAL([ANSI_PRINTER])
-m4trace:configure.ac:573: -1- m4_pattern_allow([^ANSI_PRINTER$])
-m4trace:configure.ac:573: -1- AH_OUTPUT([ANSI_PRINTER], [/* Default configuration value */
+m4trace:configure.ac:574: -1- AC_DEFINE_TRACE_LITERAL([ANSI_PRINTER])
+m4trace:configure.ac:574: -1- m4_pattern_allow([^ANSI_PRINTER$])
+m4trace:configure.ac:574: -1- AH_OUTPUT([ANSI_PRINTER], [/* Default configuration value */
 @%:@undef ANSI_PRINTER])
-m4trace:configure.ac:574: -1- AC_DEFINE_TRACE_LITERAL([DF_ADDRESSBOOK])
-m4trace:configure.ac:574: -1- m4_pattern_allow([^DF_ADDRESSBOOK$])
-m4trace:configure.ac:574: -1- AH_OUTPUT([DF_ADDRESSBOOK], [/* Default configuration value */
+m4trace:configure.ac:575: -1- AC_DEFINE_TRACE_LITERAL([DF_ADDRESSBOOK])
+m4trace:configure.ac:575: -1- m4_pattern_allow([^DF_ADDRESSBOOK$])
+m4trace:configure.ac:575: -1- AH_OUTPUT([DF_ADDRESSBOOK], [/* Default configuration value */
 @%:@undef DF_ADDRESSBOOK])
-m4trace:configure.ac:575: -1- AC_DEFINE_TRACE_LITERAL([DF_LOCAL_FULLNAME])
-m4trace:configure.ac:575: -1- m4_pattern_allow([^DF_LOCAL_FULLNAME$])
-m4trace:configure.ac:575: -1- AH_OUTPUT([DF_LOCAL_FULLNAME], [/* Default configuration value */
+m4trace:configure.ac:576: -1- AC_DEFINE_TRACE_LITERAL([DF_LOCAL_FULLNAME])
+m4trace:configure.ac:576: -1- m4_pattern_allow([^DF_LOCAL_FULLNAME$])
+m4trace:configure.ac:576: -1- AH_OUTPUT([DF_LOCAL_FULLNAME], [/* Default configuration value */
 @%:@undef DF_LOCAL_FULLNAME])
-m4trace:configure.ac:576: -1- AC_DEFINE_TRACE_LITERAL([DF_LOCAL_ADDRESS])
-m4trace:configure.ac:576: -1- m4_pattern_allow([^DF_LOCAL_ADDRESS$])
-m4trace:configure.ac:576: -1- AH_OUTPUT([DF_LOCAL_ADDRESS], [/* Default configuration value */
+m4trace:configure.ac:577: -1- AC_DEFINE_TRACE_LITERAL([DF_LOCAL_ADDRESS])
+m4trace:configure.ac:577: -1- m4_pattern_allow([^DF_LOCAL_ADDRESS$])
+m4trace:configure.ac:577: -1- AH_OUTPUT([DF_LOCAL_ADDRESS], [/* Default configuration value */
 @%:@undef DF_LOCAL_ADDRESS])
-m4trace:configure.ac:577: -1- AC_DEFINE_TRACE_LITERAL([DF_KBLOCK_PASSWD_COUNT])
-m4trace:configure.ac:577: -1- m4_pattern_allow([^DF_KBLOCK_PASSWD_COUNT$])
-m4trace:configure.ac:577: -1- AH_OUTPUT([DF_KBLOCK_PASSWD_COUNT], [/* Default configuration value */
+m4trace:configure.ac:578: -1- AC_DEFINE_TRACE_LITERAL([DF_KBLOCK_PASSWD_COUNT])
+m4trace:configure.ac:578: -1- m4_pattern_allow([^DF_KBLOCK_PASSWD_COUNT$])
+m4trace:configure.ac:578: -1- AH_OUTPUT([DF_KBLOCK_PASSWD_COUNT], [/* Default configuration value */
 @%:@undef DF_KBLOCK_PASSWD_COUNT])
-m4trace:configure.ac:578: -1- AC_DEFINE_TRACE_LITERAL([DF_REMOTE_ABOOK_HISTORY])
-m4trace:configure.ac:578: -1- m4_pattern_allow([^DF_REMOTE_ABOOK_HISTORY$])
-m4trace:configure.ac:578: -1- AH_OUTPUT([DF_REMOTE_ABOOK_HISTORY], [/* Default configuration value */
+m4trace:configure.ac:579: -1- AC_DEFINE_TRACE_LITERAL([DF_REMOTE_ABOOK_HISTORY])
+m4trace:configure.ac:579: -1- m4_pattern_allow([^DF_REMOTE_ABOOK_HISTORY$])
+m4trace:configure.ac:579: -1- AH_OUTPUT([DF_REMOTE_ABOOK_HISTORY], [/* Default configuration value */
 @%:@undef DF_REMOTE_ABOOK_HISTORY])
-m4trace:configure.ac:579: -1- AC_DEFINE_TRACE_LITERAL([DF_PUBLICCERT_DIR])
-m4trace:configure.ac:579: -1- m4_pattern_allow([^DF_PUBLICCERT_DIR$])
-m4trace:configure.ac:579: -1- AH_OUTPUT([DF_PUBLICCERT_DIR], [/* Default configuration value */
+m4trace:configure.ac:580: -1- AC_DEFINE_TRACE_LITERAL([DF_PUBLICCERT_DIR])
+m4trace:configure.ac:580: -1- m4_pattern_allow([^DF_PUBLICCERT_DIR$])
+m4trace:configure.ac:580: -1- AH_OUTPUT([DF_PUBLICCERT_DIR], [/* Default configuration value */
 @%:@undef DF_PUBLICCERT_DIR])
-m4trace:configure.ac:580: -1- AC_DEFINE_TRACE_LITERAL([DF_PRIVATEKEY_DIR])
-m4trace:configure.ac:580: -1- m4_pattern_allow([^DF_PRIVATEKEY_DIR$])
-m4trace:configure.ac:580: -1- AH_OUTPUT([DF_PRIVATEKEY_DIR], [/* Default configuration value */
+m4trace:configure.ac:581: -1- AC_DEFINE_TRACE_LITERAL([DF_PRIVATEKEY_DIR])
+m4trace:configure.ac:581: -1- m4_pattern_allow([^DF_PRIVATEKEY_DIR$])
+m4trace:configure.ac:581: -1- AH_OUTPUT([DF_PRIVATEKEY_DIR], [/* Default configuration value */
 @%:@undef DF_PRIVATEKEY_DIR])
-m4trace:configure.ac:581: -1- AC_DEFINE_TRACE_LITERAL([DF_CACERT_DIR])
-m4trace:configure.ac:581: -1- m4_pattern_allow([^DF_CACERT_DIR$])
-m4trace:configure.ac:581: -1- AH_OUTPUT([DF_CACERT_DIR], [/* Default configuration value */
+m4trace:configure.ac:582: -1- AC_DEFINE_TRACE_LITERAL([DF_CACERT_DIR])
+m4trace:configure.ac:582: -1- m4_pattern_allow([^DF_CACERT_DIR$])
+m4trace:configure.ac:582: -1- AH_OUTPUT([DF_CACERT_DIR], [/* Default configuration value */
 @%:@undef DF_CACERT_DIR])
-m4trace:configure.ac:582: -1- AC_DEFINE_TRACE_LITERAL([DF_DEFAULT_PRINTER])
-m4trace:configure.ac:582: -1- m4_pattern_allow([^DF_DEFAULT_PRINTER$])
-m4trace:configure.ac:582: -1- AH_OUTPUT([DF_DEFAULT_PRINTER], [/* Default configuration value */
+m4trace:configure.ac:583: -1- AC_DEFINE_TRACE_LITERAL([DF_DEFAULT_PRINTER])
+m4trace:configure.ac:583: -1- m4_pattern_allow([^DF_DEFAULT_PRINTER$])
+m4trace:configure.ac:583: -1- AH_OUTPUT([DF_DEFAULT_PRINTER], [/* Default configuration value */
 @%:@undef DF_DEFAULT_PRINTER])
-m4trace:configure.ac:622: -1- AC_DEFINE_TRACE_LITERAL([PASSFILE])
-m4trace:configure.ac:622: -1- m4_pattern_allow([^PASSFILE$])
-m4trace:configure.ac:622: -1- AH_OUTPUT([PASSFILE], [/* Password cache file (NOT secure. NOT recommended) */
+m4trace:configure.ac:623: -1- AC_DEFINE_TRACE_LITERAL([PASSFILE])
+m4trace:configure.ac:623: -1- m4_pattern_allow([^PASSFILE$])
+m4trace:configure.ac:623: -1- AH_OUTPUT([PASSFILE], [/* Password cache file (NOT secure. NOT recommended) */
 @%:@undef PASSFILE])
-m4trace:configure.ac:626: -1- AC_DEFINE_TRACE_LITERAL([DF_SSHPATH])
-m4trace:configure.ac:626: -1- m4_pattern_allow([^DF_SSHPATH$])
-m4trace:configure.ac:626: -1- AH_OUTPUT([DF_SSHPATH], [/* set default value of ssh command path (defining should cause ssh to be
+m4trace:configure.ac:627: -1- AC_DEFINE_TRACE_LITERAL([DF_SSHPATH])
+m4trace:configure.ac:627: -1- m4_pattern_allow([^DF_SSHPATH$])
+m4trace:configure.ac:627: -1- AH_OUTPUT([DF_SSHPATH], [/* set default value of ssh command path (defining should cause ssh to be
    preferred to rsh) */
 @%:@undef DF_SSHPATH])
-m4trace:configure.ac:641: -1- AC_DEFINE_TRACE_LITERAL([DF_SSHCMD])
-m4trace:configure.ac:641: -1- m4_pattern_allow([^DF_SSHCMD$])
-m4trace:configure.ac:641: -1- AH_OUTPUT([DF_SSHCMD], [/* set default value of ssh command string (usually "%s %s -l %s exec
+m4trace:configure.ac:642: -1- AC_DEFINE_TRACE_LITERAL([DF_SSHCMD])
+m4trace:configure.ac:642: -1- m4_pattern_allow([^DF_SSHCMD$])
+m4trace:configure.ac:642: -1- AH_OUTPUT([DF_SSHCMD], [/* set default value of ssh command string (usually "%s %s -l %s exec
    /etc/r%sd") */
 @%:@undef DF_SSHCMD])
-m4trace:configure.ac:998: -1- AC_DEFINE_TRACE_LITERAL([OSX_TARGET])
-m4trace:configure.ac:998: -1- m4_pattern_allow([^OSX_TARGET$])
-m4trace:configure.ac:998: -1- AH_OUTPUT([OSX_TARGET], [/* OSX TARGET */
+m4trace:configure.ac:999: -1- AC_DEFINE_TRACE_LITERAL([OSX_TARGET])
+m4trace:configure.ac:999: -1- m4_pattern_allow([^OSX_TARGET$])
+m4trace:configure.ac:999: -1- AH_OUTPUT([OSX_TARGET], [/* OSX TARGET */
 @%:@undef OSX_TARGET])
-m4trace:configure.ac:1003: -1- AC_DEFINE_TRACE_LITERAL([APPLEKEYCHAIN])
-m4trace:configure.ac:1003: -1- m4_pattern_allow([^APPLEKEYCHAIN$])
-m4trace:configure.ac:1003: -1- AH_OUTPUT([APPLEKEYCHAIN], [/* Use Apple OS X key chain for credential caching */
+m4trace:configure.ac:1004: -1- AC_DEFINE_TRACE_LITERAL([APPLEKEYCHAIN])
+m4trace:configure.ac:1004: -1- m4_pattern_allow([^APPLEKEYCHAIN$])
+m4trace:configure.ac:1004: -1- AH_OUTPUT([APPLEKEYCHAIN], [/* Use Apple OS X key chain for credential caching */
 @%:@undef APPLEKEYCHAIN])
-m4trace:configure.ac:1035: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
-m4trace:configure.ac:1035: -1- m4_pattern_allow([^__EXTENSIONS__$])
-m4trace:configure.ac:1035: -1- AH_OUTPUT([__EXTENSIONS__], [/* Enable extended pthread features on Solaris */
+m4trace:configure.ac:1036: -1- AC_DEFINE_TRACE_LITERAL([__EXTENSIONS__])
+m4trace:configure.ac:1036: -1- m4_pattern_allow([^__EXTENSIONS__$])
+m4trace:configure.ac:1036: -1- AH_OUTPUT([__EXTENSIONS__], [/* Enable extended pthread features on Solaris */
 @%:@undef __EXTENSIONS__])
-m4trace:configure.ac:1166: -1- AC_DEFINE_TRACE_LITERAL([_WINDOWS])
-m4trace:configure.ac:1166: -1- m4_pattern_allow([^_WINDOWS$])
-m4trace:configure.ac:1166: -1- AH_OUTPUT([_WINDOWS], [/* Windows is just too different */
+m4trace:configure.ac:1167: -1- AC_DEFINE_TRACE_LITERAL([_WINDOWS])
+m4trace:configure.ac:1167: -1- m4_pattern_allow([^_WINDOWS$])
+m4trace:configure.ac:1167: -1- AH_OUTPUT([_WINDOWS], [/* Windows is just too different */
 @%:@undef _WINDOWS])
-m4trace:configure.ac:1241: -1- AC_DEFINE_TRACE_LITERAL([HAS_TERMINFO])
-m4trace:configure.ac:1241: -1- m4_pattern_allow([^HAS_TERMINFO$])
-m4trace:configure.ac:1241: -1- AH_OUTPUT([HAS_TERMINFO], [/* Define if systems uses terminfo terminal database */
+m4trace:configure.ac:1242: -1- AC_DEFINE_TRACE_LITERAL([HAS_TERMINFO])
+m4trace:configure.ac:1242: -1- m4_pattern_allow([^HAS_TERMINFO$])
+m4trace:configure.ac:1242: -1- AH_OUTPUT([HAS_TERMINFO], [/* Define if systems uses terminfo terminal database */
 @%:@undef HAS_TERMINFO])
-m4trace:configure.ac:1244: -1- AC_DEFINE_TRACE_LITERAL([HAS_TERMCAP])
-m4trace:configure.ac:1244: -1- m4_pattern_allow([^HAS_TERMCAP$])
-m4trace:configure.ac:1244: -1- AH_OUTPUT([HAS_TERMCAP], [/* Define if systems uses termcap terminal database */
+m4trace:configure.ac:1245: -1- AC_DEFINE_TRACE_LITERAL([HAS_TERMCAP])
+m4trace:configure.ac:1245: -1- m4_pattern_allow([^HAS_TERMCAP$])
+m4trace:configure.ac:1245: -1- AH_OUTPUT([HAS_TERMCAP], [/* Define if systems uses termcap terminal database */
 @%:@undef HAS_TERMCAP])
-m4trace:configure.ac:1268: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_LDAP])
-m4trace:configure.ac:1268: -1- m4_pattern_allow([^ENABLE_LDAP$])
-m4trace:configure.ac:1268: -1- AH_OUTPUT([ENABLE_LDAP], [/* Enable LDAP query support */
+m4trace:configure.ac:1269: -1- AC_DEFINE_TRACE_LITERAL([ENABLE_LDAP])
+m4trace:configure.ac:1269: -1- m4_pattern_allow([^ENABLE_LDAP$])
+m4trace:configure.ac:1269: -1- AH_OUTPUT([ENABLE_LDAP], [/* Enable LDAP query support */
 @%:@undef ENABLE_LDAP])
-m4trace:configure.ac:1273: -1- AC_DEFINE_TRACE_LITERAL([LDAP_DEPRECATED])
-m4trace:configure.ac:1273: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
-m4trace:configure.ac:1273: -1- AH_OUTPUT([LDAP_DEPRECATED], [/* Define if you use OpenLDAP 2.3.x deprecated functions */
+m4trace:configure.ac:1274: -1- AC_DEFINE_TRACE_LITERAL([LDAP_DEPRECATED])
+m4trace:configure.ac:1274: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
+m4trace:configure.ac:1274: -1- AH_OUTPUT([LDAP_DEPRECATED], [/* Define if you use OpenLDAP 2.3.x deprecated functions */
 @%:@undef LDAP_DEPRECATED])
-m4trace:configure.ac:1437: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [../../lib/autoconf/general.m4:2777: AC_CHECK_FILE is expanded from...
+m4trace:configure.ac:1438: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [../../lib/autoconf/general.m4:2777: AC_CHECK_FILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
 ../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-configure.ac:1437: the top level])
-m4trace:configure.ac:1483: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGEX_H])
-m4trace:configure.ac:1483: -1- m4_pattern_allow([^HAVE_REGEX_H$])
-m4trace:configure.ac:1483: -1- AH_OUTPUT([HAVE_REGEX_H], [/* Regular expression header file exists */
+configure.ac:1438: the top level])
+m4trace:configure.ac:1484: -1- AC_DEFINE_TRACE_LITERAL([HAVE_REGEX_H])
+m4trace:configure.ac:1484: -1- m4_pattern_allow([^HAVE_REGEX_H$])
+m4trace:configure.ac:1484: -1- AH_OUTPUT([HAVE_REGEX_H], [/* Regular expression header file exists */
 @%:@undef HAVE_REGEX_H])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:125: AC_LANG_SAVE is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
+configure.ac:1493: the top level])
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/c.m4:72: AC_LANG_C is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1492: -1- AC_SUBST([acx_pthread_config])
-m4trace:configure.ac:1492: -1- AC_SUBST_TRACE([acx_pthread_config])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^acx_pthread_config$])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1493: the top level])
+m4trace:configure.ac:1493: -1- AC_SUBST([acx_pthread_config])
+m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([acx_pthread_config])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^acx_pthread_config$])
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1493: the top level])
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1492: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
-m4trace:configure.ac:1492: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
+configure.ac:1493: the top level])
+m4trace:configure.ac:1493: -1- AC_DEFINE_TRACE_LITERAL([PTHREAD_CREATE_JOINABLE])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
+m4trace:configure.ac:1493: -1- AH_OUTPUT([PTHREAD_CREATE_JOINABLE], [/* Define to necessary symbol if this constant uses a non-standard name on
    your system. */
 @%:@undef PTHREAD_CREATE_JOINABLE])
-m4trace:configure.ac:1492: -1- AC_SUBST([PTHREAD_CC])
-m4trace:configure.ac:1492: -1- AC_SUBST_TRACE([PTHREAD_CC])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1492: -1- AC_SUBST([PTHREAD_LIBS])
-m4trace:configure.ac:1492: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:1492: -1- AC_SUBST([PTHREAD_CFLAGS])
-m4trace:configure.ac:1492: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
-m4trace:configure.ac:1492: -1- AC_SUBST([PTHREAD_CC])
-m4trace:configure.ac:1492: -1- AC_SUBST_TRACE([PTHREAD_CC])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1492: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
-m4trace:configure.ac:1492: -2- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1492: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
+m4trace:configure.ac:1493: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1493: -1- AC_SUBST([PTHREAD_LIBS])
+m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([PTHREAD_LIBS])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:1493: -1- AC_SUBST([PTHREAD_CFLAGS])
+m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([PTHREAD_CFLAGS])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
+m4trace:configure.ac:1493: -1- AC_SUBST([PTHREAD_CC])
+m4trace:configure.ac:1493: -1- AC_SUBST_TRACE([PTHREAD_CC])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1493: -2- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
+m4trace:configure.ac:1493: -2- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1493: -2- AH_OUTPUT([HAVE_PTHREAD], [/* Define if you have POSIX threads libraries and header files. */
 @%:@undef HAVE_PTHREAD])
-m4trace:configure.ac:1492: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1492: -1- AH_OUTPUT([HAVE_PTHREAD], [/* System has pthread support */
+m4trace:configure.ac:1493: -1- AC_DEFINE_TRACE_LITERAL([HAVE_PTHREAD])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1493: -1- AH_OUTPUT([HAVE_PTHREAD], [/* System has pthread support */
 @%:@undef HAVE_PTHREAD])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:134: AC_LANG_RESTORE is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1510: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NANOSLEEP])
-m4trace:configure.ac:1510: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
-m4trace:configure.ac:1510: -1- AH_OUTPUT([HAVE_NANOSLEEP], [/* Define if system supports subsecond, non-alarm sleep */
+configure.ac:1493: the top level])
+m4trace:configure.ac:1511: -1- AC_DEFINE_TRACE_LITERAL([HAVE_NANOSLEEP])
+m4trace:configure.ac:1511: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
+m4trace:configure.ac:1511: -1- AH_OUTPUT([HAVE_NANOSLEEP], [/* Define if system supports subsecond, non-alarm sleep */
 @%:@undef HAVE_NANOSLEEP])
-m4trace:configure.ac:1520: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
-m4trace:configure.ac:1520: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:1520: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
+m4trace:configure.ac:1521: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
+m4trace:configure.ac:1521: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:1521: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
 @%:@undef STDC_HEADERS])
-m4trace:configure.ac:1521: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1522: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR\'.
    */
 @%:@undef HAVE_DIRENT_H])
-m4trace:configure.ac:1521: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1522: -1- AH_OUTPUT([HAVE_SYS_NDIR_H], [/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR\'.
    */
 @%:@undef HAVE_SYS_NDIR_H])
-m4trace:configure.ac:1521: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
+m4trace:configure.ac:1522: -1- AH_OUTPUT([HAVE_SYS_DIR_H], [/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR\'.
    */
 @%:@undef HAVE_SYS_DIR_H])
-m4trace:configure.ac:1521: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
+m4trace:configure.ac:1522: -1- AH_OUTPUT([HAVE_NDIR_H], [/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR\'. */
 @%:@undef HAVE_NDIR_H])
-m4trace:configure.ac:1522: -1- AC_DEFINE_TRACE_LITERAL([STAT_MACROS_BROKEN])
-m4trace:configure.ac:1522: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
-m4trace:configure.ac:1522: -1- AH_OUTPUT([STAT_MACROS_BROKEN], [/* Define to 1 if the `S_IS*\' macros in <sys/stat.h> do not work properly. */
+m4trace:configure.ac:1523: -1- AC_DEFINE_TRACE_LITERAL([STAT_MACROS_BROKEN])
+m4trace:configure.ac:1523: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
+m4trace:configure.ac:1523: -1- AH_OUTPUT([STAT_MACROS_BROKEN], [/* Define to 1 if the `S_IS*\' macros in <sys/stat.h> do not work properly. */
 @%:@undef STAT_MACROS_BROKEN])
-m4trace:configure.ac:1523: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H])
-m4trace:configure.ac:1523: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
-m4trace:configure.ac:1523: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+m4trace:configure.ac:1524: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_WAIT_H])
+m4trace:configure.ac:1524: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
+m4trace:configure.ac:1524: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
 @%:@undef HAVE_SYS_WAIT_H])
-m4trace:configure.ac:1524: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
-m4trace:configure.ac:1524: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:1524: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+m4trace:configure.ac:1525: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME])
+m4trace:configure.ac:1525: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:1525: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 @%:@undef TIME_WITH_SYS_TIME])
-m4trace:configure.ac:1525: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.ac:1525: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
-m4trace:configure.ac:1525: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
+m4trace:configure.ac:1526: -1- AC_DEFINE_TRACE_LITERAL([GWINSZ_IN_SYS_IOCTL])
+m4trace:configure.ac:1526: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
+m4trace:configure.ac:1526: -1- AH_OUTPUT([GWINSZ_IN_SYS_IOCTL], [/* Define to 1 if `TIOCGWINSZ\' requires <sys/ioctl.h>. */
 @%:@undef GWINSZ_IN_SYS_IOCTL])
-m4trace:configure.ac:1527: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
+m4trace:configure.ac:1528: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
 @%:@undef HAVE_UNISTD_H])
-m4trace:configure.ac:1527: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H])
-m4trace:configure.ac:1527: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
+m4trace:configure.ac:1528: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNISTD_H])
+m4trace:configure.ac:1528: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_ERRNO_H], [/* Define to 1 if you have the <errno.h> header file. */
 @%:@undef HAVE_ERRNO_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the <ctype.h> header file. */
 @%:@undef HAVE_CTYPE_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the <fcntl.h> header file. */
 @%:@undef HAVE_FCNTL_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the <signal.h> header file. */
 @%:@undef HAVE_SIGNAL_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SETJMP_H], [/* Define to 1 if you have the <setjmp.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SETJMP_H], [/* Define to 1 if you have the <setjmp.h> header file. */
 @%:@undef HAVE_SETJMP_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
 @%:@undef HAVE_MEMORY_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the <sys/param.h> header file. */
 @%:@undef HAVE_SYS_PARAM_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
 @%:@undef HAVE_SYS_SOCKET_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYS_UIO_H], [/* Define to 1 if you have the <sys/uio.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_UIO_H], [/* Define to 1 if you have the <sys/uio.h> header file. */
 @%:@undef HAVE_SYS_UIO_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define to 1 if you have the <sys/un.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_UN_H], [/* Define to 1 if you have the <sys/un.h> header file. */
 @%:@undef HAVE_SYS_UN_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_LIMITS_H], [/* Define to 1 if you have the <limits.h> header file. */
 @%:@undef HAVE_LIMITS_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_WCHAR_H], [/* Define to 1 if you have the <wchar.h> header file. */
 @%:@undef HAVE_WCHAR_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYS_POLL_H], [/* Define to 1 if you have the <sys/poll.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_POLL_H], [/* Define to 1 if you have the <sys/poll.h> header file. */
 @%:@undef HAVE_SYS_POLL_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_STROPTS_H], [/* Define to 1 if you have the <stropts.h> header file. */
 @%:@undef HAVE_STROPTS_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_NETDB_H], [/* Define to 1 if you have the <netdb.h> header file. */
 @%:@undef HAVE_NETDB_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYSLOG_H], [/* Define to 1 if you have the <syslog.h> header file. */
 @%:@undef HAVE_SYSLOG_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYS_SYSLOG_H], [/* Define to 1 if you have the <sys/syslog.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_SYSLOG_H], [/* Define to 1 if you have the <sys/syslog.h> header file. */
 @%:@undef HAVE_SYS_SYSLOG_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the <locale.h> header file. */
 @%:@undef HAVE_LOCALE_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_LANGINFO_H], [/* Define to 1 if you have the <langinfo.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_LANGINFO_H], [/* Define to 1 if you have the <langinfo.h> header file. */
 @%:@undef HAVE_LANGINFO_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define to 1 if you have the <utime.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_UTIME_H], [/* Define to 1 if you have the <utime.h> header file. */
 @%:@undef HAVE_UTIME_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_SYS_UTIME_H], [/* Define to 1 if you have the <sys/utime.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_SYS_UTIME_H], [/* Define to 1 if you have the <sys/utime.h> header file. */
 @%:@undef HAVE_SYS_UTIME_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_PTHREAD_H], [/* Define to 1 if you have the <pthread.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_PTHREAD_H], [/* Define to 1 if you have the <pthread.h> header file. */
 @%:@undef HAVE_PTHREAD_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_PWD_H], [/* Define to 1 if you have the <pwd.h> header file. */
 @%:@undef HAVE_PWD_H])
-m4trace:configure.ac:1529: -1- AH_OUTPUT([HAVE_ASSERT_H], [/* Define to 1 if you have the <assert.h> header file. */
+m4trace:configure.ac:1530: -1- AH_OUTPUT([HAVE_ASSERT_H], [/* Define to 1 if you have the <assert.h> header file. */
 @%:@undef HAVE_ASSERT_H])
-m4trace:configure.ac:1556: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIOS])
-m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_TERMIOS$])
-m4trace:configure.ac:1556: -2- AH_OUTPUT([HAS_TERMIOS], [/* Define if systems uses termios terminal control */
+m4trace:configure.ac:1557: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIOS])
+m4trace:configure.ac:1557: -2- m4_pattern_allow([^HAS_TERMIOS$])
+m4trace:configure.ac:1557: -2- AH_OUTPUT([HAS_TERMIOS], [/* Define if systems uses termios terminal control */
 @%:@undef HAS_TERMIOS])
-m4trace:configure.ac:1555: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIO])
-m4trace:configure.ac:1555: -2- m4_pattern_allow([^HAS_TERMIO$])
-m4trace:configure.ac:1555: -2- AH_OUTPUT([HAS_TERMIO], [/* Define if systems uses termio terminal control */
+m4trace:configure.ac:1556: -2- AC_DEFINE_TRACE_LITERAL([HAS_TERMIO])
+m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_TERMIO$])
+m4trace:configure.ac:1556: -2- AH_OUTPUT([HAS_TERMIO], [/* Define if systems uses termio terminal control */
 @%:@undef HAS_TERMIO])
-m4trace:configure.ac:1555: -2- AC_DEFINE_TRACE_LITERAL([HAS_SGTTY])
-m4trace:configure.ac:1555: -2- m4_pattern_allow([^HAS_SGTTY$])
-m4trace:configure.ac:1555: -2- AH_OUTPUT([HAS_SGTTY], [/* Define if systems uses old BSD-style terminal control */
+m4trace:configure.ac:1556: -2- AC_DEFINE_TRACE_LITERAL([HAS_SGTTY])
+m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_SGTTY$])
+m4trace:configure.ac:1556: -2- AH_OUTPUT([HAS_SGTTY], [/* Define if systems uses old BSD-style terminal control */
 @%:@undef HAS_SGTTY])
-m4trace:configure.ac:1572: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
+m4trace:configure.ac:1573: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
 Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.], [])
-m4trace:configure.ac:1581: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
-m4trace:configure.ac:1581: -1- m4_pattern_allow([^RETSIGTYPE$])
-m4trace:configure.ac:1581: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
+m4trace:configure.ac:1582: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
+m4trace:configure.ac:1582: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:1582: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
 @%:@undef RETSIGTYPE])
-m4trace:configure.ac:1584: -1- AC_DEFINE_TRACE_LITERAL([size_t])
-m4trace:configure.ac:1584: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:1584: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1585: -1- AC_DEFINE_TRACE_LITERAL([size_t])
+m4trace:configure.ac:1585: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:1585: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
 @%:@undef size_t])
-m4trace:configure.ac:1585: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
-m4trace:configure.ac:1585: -1- m4_pattern_allow([^mode_t$])
-m4trace:configure.ac:1585: -1- AH_OUTPUT([mode_t], [/* Define to `int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1586: -1- AC_DEFINE_TRACE_LITERAL([mode_t])
+m4trace:configure.ac:1586: -1- m4_pattern_allow([^mode_t$])
+m4trace:configure.ac:1586: -1- AH_OUTPUT([mode_t], [/* Define to `int\' if <sys/types.h> does not define. */
 @%:@undef mode_t])
-m4trace:configure.ac:1586: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
-m4trace:configure.ac:1586: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:1586: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
+m4trace:configure.ac:1587: -1- AC_DEFINE_TRACE_LITERAL([pid_t])
+m4trace:configure.ac:1587: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:1587: -1- AH_OUTPUT([pid_t], [/* Define to `int\' if <sys/types.h> does not define. */
 @%:@undef pid_t])
-m4trace:configure.ac:1587: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
-m4trace:configure.ac:1587: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:1587: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:1588: -1- AC_DEFINE_TRACE_LITERAL([uid_t])
+m4trace:configure.ac:1588: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:1588: -1- AH_OUTPUT([uid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
 @%:@undef uid_t])
-m4trace:configure.ac:1587: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
-m4trace:configure.ac:1587: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:1587: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
+m4trace:configure.ac:1588: -1- AC_DEFINE_TRACE_LITERAL([gid_t])
+m4trace:configure.ac:1588: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:1588: -1- AH_OUTPUT([gid_t], [/* Define to `int\' if <sys/types.h> doesn\'t define. */
 @%:@undef gid_t])
-m4trace:configure.ac:1588: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
-m4trace:configure.ac:1588: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-m4trace:configure.ac:1588: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
+m4trace:configure.ac:1589: -1- AC_DEFINE_TRACE_LITERAL([TM_IN_SYS_TIME])
+m4trace:configure.ac:1589: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
+m4trace:configure.ac:1589: -1- AH_OUTPUT([TM_IN_SYS_TIME], [/* Define to 1 if your <sys/time.h> declares `struct tm\'. */
 @%:@undef TM_IN_SYS_TIME])
-m4trace:configure.ac:1590: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNION_WAIT])
-m4trace:configure.ac:1590: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
-m4trace:configure.ac:1590: -1- AH_OUTPUT([HAVE_UNION_WAIT], [/* Define to 1 if the system has the type `union wait\'. */
+m4trace:configure.ac:1591: -1- AC_DEFINE_TRACE_LITERAL([HAVE_UNION_WAIT])
+m4trace:configure.ac:1591: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
+m4trace:configure.ac:1591: -1- AH_OUTPUT([HAVE_UNION_WAIT], [/* Define to 1 if the system has the type `union wait\'. */
 @%:@undef HAVE_UNION_WAIT])
-m4trace:configure.ac:1592: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:1593: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1592: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1593: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1592: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1593: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
 @%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_SHORT])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
-m4trace:configure.ac:1592: -1- AH_OUTPUT([SIZEOF_UNSIGNED_SHORT], [/* The size of `unsigned short\', as computed by sizeof. */
+m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_SHORT])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
+m4trace:configure.ac:1593: -1- AH_OUTPUT([SIZEOF_UNSIGNED_SHORT], [/* The size of `unsigned short\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_SHORT])
-m4trace:configure.ac:1592: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1592: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
+m4trace:configure.ac:1593: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1593: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1609: -1- AC_DEFINE_TRACE_LITERAL([UINT16])
-m4trace:configure.ac:1609: -1- m4_pattern_allow([^UINT16$])
-m4trace:configure.ac:1609: -1- AH_OUTPUT([UINT16], [/* System defined unsigned 16 bit integer */
+m4trace:configure.ac:1610: -1- AC_DEFINE_TRACE_LITERAL([UINT16])
+m4trace:configure.ac:1610: -1- m4_pattern_allow([^UINT16$])
+m4trace:configure.ac:1610: -1- AH_OUTPUT([UINT16], [/* System defined unsigned 16 bit integer */
 @%:@undef UINT16])
-m4trace:configure.ac:1611: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
+m4trace:configure.ac:1612: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
 @%:@undef HAVE_STDINT_H])
-m4trace:configure.ac:1611: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1611: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
+m4trace:configure.ac:1612: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STDINT_H])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1612: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
 @%:@undef HAVE_INTTYPES_H])
-m4trace:configure.ac:1611: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1611: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
+m4trace:configure.ac:1612: -1- AC_DEFINE_TRACE_LITERAL([HAVE_INTTYPES_H])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1612: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
 @%:@undef HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1611: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1611: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1611: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
+m4trace:configure.ac:1612: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_TYPES_H])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1612: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_INT])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1612: -1- AH_OUTPUT([SIZEOF_UNSIGNED_INT], [/* The size of `unsigned int\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_INT])
-m4trace:configure.ac:1611: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
-m4trace:configure.ac:1611: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG], [/* The size of `unsigned long\', as computed by sizeof. */
+m4trace:configure.ac:1612: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_UNSIGNED_LONG])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
+m4trace:configure.ac:1612: -1- AH_OUTPUT([SIZEOF_UNSIGNED_LONG], [/* The size of `unsigned long\', as computed by sizeof. */
 @%:@undef SIZEOF_UNSIGNED_LONG])
-m4trace:configure.ac:1628: -1- AC_DEFINE_TRACE_LITERAL([UINT32])
-m4trace:configure.ac:1628: -1- m4_pattern_allow([^UINT32$])
-m4trace:configure.ac:1628: -1- AH_OUTPUT([UINT32], [/* System defined unsigned 32 bit integer */
+m4trace:configure.ac:1629: -1- AC_DEFINE_TRACE_LITERAL([UINT32])
+m4trace:configure.ac:1629: -1- m4_pattern_allow([^UINT32$])
+m4trace:configure.ac:1629: -1- AH_OUTPUT([UINT32], [/* System defined unsigned 32 bit integer */
 @%:@undef UINT32])
-m4trace:configure.ac:1646: -1- AC_DEFINE_TRACE_LITERAL([qsort_t])
-m4trace:configure.ac:1646: -1- m4_pattern_allow([^qsort_t$])
-m4trace:configure.ac:1646: -1- AH_OUTPUT([qsort_t], [/* qsort compare function argument type */
+m4trace:configure.ac:1647: -1- AC_DEFINE_TRACE_LITERAL([qsort_t])
+m4trace:configure.ac:1647: -1- m4_pattern_allow([^qsort_t$])
+m4trace:configure.ac:1647: -1- AH_OUTPUT([qsort_t], [/* qsort compare function argument type */
 @%:@undef qsort_t])
-m4trace:configure.ac:1650: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
+m4trace:configure.ac:1651: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the <sys/select.h> header file. */
 @%:@undef HAVE_SYS_SELECT_H])
-m4trace:configure.ac:1650: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
+m4trace:configure.ac:1651: -1- AH_OUTPUT([HAVE_SYS_SOCKET_H], [/* Define to 1 if you have the <sys/socket.h> header file. */
 @%:@undef HAVE_SYS_SOCKET_H])
-m4trace:configure.ac:1650: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG1])
-m4trace:configure.ac:1650: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:1650: -1- AH_OUTPUT([SELECT_TYPE_ARG1], [/* Define to the type of arg 1 for `select\'. */
+m4trace:configure.ac:1651: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG1])
+m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:1651: -1- AH_OUTPUT([SELECT_TYPE_ARG1], [/* Define to the type of arg 1 for `select\'. */
 @%:@undef SELECT_TYPE_ARG1])
-m4trace:configure.ac:1650: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG234])
-m4trace:configure.ac:1650: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:1650: -1- AH_OUTPUT([SELECT_TYPE_ARG234], [/* Define to the type of args 2, 3 and 4 for `select\'. */
+m4trace:configure.ac:1651: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG234])
+m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:1651: -1- AH_OUTPUT([SELECT_TYPE_ARG234], [/* Define to the type of args 2, 3 and 4 for `select\'. */
 @%:@undef SELECT_TYPE_ARG234])
-m4trace:configure.ac:1650: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG5])
-m4trace:configure.ac:1650: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:1650: -1- AH_OUTPUT([SELECT_TYPE_ARG5], [/* Define to the type of arg 5 for `select\'. */
+m4trace:configure.ac:1651: -1- AC_DEFINE_TRACE_LITERAL([SELECT_TYPE_ARG5])
+m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:1651: -1- AH_OUTPUT([SELECT_TYPE_ARG5], [/* Define to the type of arg 5 for `select\'. */
 @%:@undef SELECT_TYPE_ARG5])
-m4trace:configure.ac:1652: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCOLL])
-m4trace:configure.ac:1652: -1- m4_pattern_allow([^HAVE_STRCOLL$])
-m4trace:configure.ac:1652: -1- AH_OUTPUT([HAVE_STRCOLL], [/* Define to 1 if you have the `strcoll\' function and it is properly defined.
+m4trace:configure.ac:1653: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STRCOLL])
+m4trace:configure.ac:1653: -1- m4_pattern_allow([^HAVE_STRCOLL$])
+m4trace:configure.ac:1653: -1- AH_OUTPUT([HAVE_STRCOLL], [/* Define to 1 if you have the `strcoll\' function and it is properly defined.
    */
 @%:@undef HAVE_STRCOLL])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([HAVE_VFORK_H], [/* Define to 1 if you have the <vfork.h> header file. */
+m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_VFORK_H], [/* Define to 1 if you have the <vfork.h> header file. */
 @%:@undef HAVE_VFORK_H])
-m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VFORK_H])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^HAVE_VFORK_H$])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([HAVE_FORK], [/* Define to 1 if you have the `fork\' function. */
+m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([HAVE_VFORK_H])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_VFORK_H$])
+m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_FORK], [/* Define to 1 if you have the `fork\' function. */
 @%:@undef HAVE_FORK])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([HAVE_VFORK], [/* Define to 1 if you have the `vfork\' function. */
+m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_VFORK], [/* Define to 1 if you have the `vfork\' function. */
 @%:@undef HAVE_VFORK])
-m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_VFORK])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([HAVE_WORKING_VFORK], [/* Define to 1 if `vfork\' works. */
+m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_VFORK])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
+m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_WORKING_VFORK], [/* Define to 1 if `vfork\' works. */
 @%:@undef HAVE_WORKING_VFORK])
-m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([vfork])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^vfork$])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([vfork], [/* Define as `fork\' if `vfork\' does not work. */
+m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([vfork])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^vfork$])
+m4trace:configure.ac:1657: -1- AH_OUTPUT([vfork], [/* Define as `fork\' if `vfork\' does not work. */
 @%:@undef vfork])
-m4trace:configure.ac:1656: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_FORK])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
-m4trace:configure.ac:1656: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */
+m4trace:configure.ac:1657: -1- AC_DEFINE_TRACE_LITERAL([HAVE_WORKING_FORK])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
+m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */
 @%:@undef HAVE_WORKING_FORK])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_STRCHR], [/* Define to 1 if you have the `strchr\' function. */
 @%:@undef HAVE_STRCHR])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_MEMCPY], [/* Define to 1 if you have the `memcpy\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_MEMCPY], [/* Define to 1 if you have the `memcpy\' function. */
 @%:@undef HAVE_MEMCPY])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_STRTOL], [/* Define to 1 if you have the `strtol\' function. */
 @%:@undef HAVE_STRTOL])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_STRTOUL], [/* Define to 1 if you have the `strtoul\' function. */
 @%:@undef HAVE_STRTOUL])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SELECT], [/* Define to 1 if you have the `select\' function. */
 @%:@undef HAVE_SELECT])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_POLL], [/* Define to 1 if you have the `poll\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_POLL], [/* Define to 1 if you have the `poll\' function. */
 @%:@undef HAVE_POLL])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_QSORT], [/* Define to 1 if you have the `qsort\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_QSORT], [/* Define to 1 if you have the `qsort\' function. */
 @%:@undef HAVE_QSORT])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_GETUID], [/* Define to 1 if you have the `getuid\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_GETUID], [/* Define to 1 if you have the `getuid\' function. */
 @%:@undef HAVE_GETUID])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_GETPWUID], [/* Define to 1 if you have the `getpwuid\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_GETPWUID], [/* Define to 1 if you have the `getpwuid\' function. */
 @%:@undef HAVE_GETPWUID])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_GETPWNAM], [/* Define to 1 if you have the `getpwnam\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_GETPWNAM], [/* Define to 1 if you have the `getpwnam\' function. */
 @%:@undef HAVE_GETPWNAM])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
 @%:@undef HAVE_GETTIMEOFDAY])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_TMPFILE], [/* Define to 1 if you have the `tmpfile\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_TMPFILE], [/* Define to 1 if you have the `tmpfile\' function. */
 @%:@undef HAVE_TMPFILE])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_UNAME], [/* Define to 1 if you have the `uname\' function. */
 @%:@undef HAVE_UNAME])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you have the `rename\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_RENAME], [/* Define to 1 if you have the `rename\' function. */
 @%:@undef HAVE_RENAME])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_READ], [/* Define to 1 if you have the `read\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_READ], [/* Define to 1 if you have the `read\' function. */
 @%:@undef HAVE_READ])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_SIGNAL], [/* Define to 1 if you have the `signal\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SIGNAL], [/* Define to 1 if you have the `signal\' function. */
 @%:@undef HAVE_SIGNAL])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_SETJMP], [/* Define to 1 if you have the `setjmp\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SETJMP], [/* Define to 1 if you have the `setjmp\' function. */
 @%:@undef HAVE_SETJMP])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_CHOWN], [/* Define to 1 if you have the `chown\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_CHOWN], [/* Define to 1 if you have the `chown\' function. */
 @%:@undef HAVE_CHOWN])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_WAIT4], [/* Define to 1 if you have the `wait4\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WAIT4], [/* Define to 1 if you have the `wait4\' function. */
 @%:@undef HAVE_WAIT4])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WAITPID], [/* Define to 1 if you have the `waitpid\' function. */
 @%:@undef HAVE_WAITPID])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_WAIT], [/* Define to 1 if you have the `wait\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WAIT], [/* Define to 1 if you have the `wait\' function. */
 @%:@undef HAVE_WAIT])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_SRANDOM], [/* Define to 1 if you have the `srandom\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SRANDOM], [/* Define to 1 if you have the `srandom\' function. */
 @%:@undef HAVE_SRANDOM])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_POPEN], [/* Define to 1 if you have the `popen\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_POPEN], [/* Define to 1 if you have the `popen\' function. */
 @%:@undef HAVE_POPEN])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_PCLOSE], [/* Define to 1 if you have the `pclose\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_PCLOSE], [/* Define to 1 if you have the `pclose\' function. */
 @%:@undef HAVE_PCLOSE])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_FSYNC], [/* Define to 1 if you have the `fsync\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_FSYNC], [/* Define to 1 if you have the `fsync\' function. */
 @%:@undef HAVE_FSYNC])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_TRUNCATE], [/* Define to 1 if you have the `truncate\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_TRUNCATE], [/* Define to 1 if you have the `truncate\' function. */
 @%:@undef HAVE_TRUNCATE])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_LISTEN], [/* Define to 1 if you have the `listen\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_LISTEN], [/* Define to 1 if you have the `listen\' function. */
 @%:@undef HAVE_LISTEN])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_WCWIDTH], [/* Define to 1 if you have the `wcwidth\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WCWIDTH], [/* Define to 1 if you have the `wcwidth\' function. */
 @%:@undef HAVE_WCWIDTH])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_MBSTOWCS], [/* Define to 1 if you have the `mbstowcs\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_MBSTOWCS], [/* Define to 1 if you have the `mbstowcs\' function. */
 @%:@undef HAVE_MBSTOWCS])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_WCRTOMB], [/* Define to 1 if you have the `wcrtomb\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_WCRTOMB], [/* Define to 1 if you have the `wcrtomb\' function. */
 @%:@undef HAVE_WCRTOMB])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_PUTENV], [/* Define to 1 if you have the `putenv\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_PUTENV], [/* Define to 1 if you have the `putenv\' function. */
 @%:@undef HAVE_PUTENV])
-m4trace:configure.ac:1657: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
+m4trace:configure.ac:1658: -1- AH_OUTPUT([HAVE_SETENV], [/* Define to 1 if you have the `setenv\' function. */
 @%:@undef HAVE_SETENV])
-m4trace:configure.ac:1703: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the `sigaction\' function. */
+m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the `sigaction\' function. */
 @%:@undef HAVE_SIGACTION])
-m4trace:configure.ac:1703: -1- AH_OUTPUT([HAVE_SIGEMPTYSET], [/* Define to 1 if you have the `sigemptyset\' function. */
+m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGEMPTYSET], [/* Define to 1 if you have the `sigemptyset\' function. */
 @%:@undef HAVE_SIGEMPTYSET])
-m4trace:configure.ac:1703: -1- AH_OUTPUT([HAVE_SIGADDSET], [/* Define to 1 if you have the `sigaddset\' function. */
+m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGADDSET], [/* Define to 1 if you have the `sigaddset\' function. */
 @%:@undef HAVE_SIGADDSET])
-m4trace:configure.ac:1703: -1- AH_OUTPUT([HAVE_SIGPROCMASK], [/* Define to 1 if you have the `sigprocmask\' function. */
+m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGPROCMASK], [/* Define to 1 if you have the `sigprocmask\' function. */
 @%:@undef HAVE_SIGPROCMASK])
-m4trace:configure.ac:1703: -1- AC_DEFINE_TRACE_LITERAL([POSIX_SIGNALS])
-m4trace:configure.ac:1703: -1- m4_pattern_allow([^POSIX_SIGNALS$])
-m4trace:configure.ac:1703: -1- AH_OUTPUT([POSIX_SIGNALS], [/* Define if system supports POSIX signal interface */
+m4trace:configure.ac:1704: -1- AC_DEFINE_TRACE_LITERAL([POSIX_SIGNALS])
+m4trace:configure.ac:1704: -1- m4_pattern_allow([^POSIX_SIGNALS$])
+m4trace:configure.ac:1704: -1- AH_OUTPUT([POSIX_SIGNALS], [/* Define if system supports POSIX signal interface */
 @%:@undef POSIX_SIGNALS])
-m4trace:configure.ac:1703: -1- AH_OUTPUT([HAVE_SIGSET], [/* Define to 1 if you have the `sigset\' function. */
+m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGSET], [/* Define to 1 if you have the `sigset\' function. */
 @%:@undef HAVE_SIGSET])
-m4trace:configure.ac:1703: -1- AH_OUTPUT([HAVE_SIGRELSE], [/* Define to 1 if you have the `sigrelse\' function. */
+m4trace:configure.ac:1704: -1- AH_OUTPUT([HAVE_SIGRELSE], [/* Define to 1 if you have the `sigrelse\' function. */
 @%:@undef HAVE_SIGRELSE])
-m4trace:configure.ac:1703: -1- AC_DEFINE_TRACE_LITERAL([SYSV_SIGNALS])
-m4trace:configure.ac:1703: -1- m4_pattern_allow([^SYSV_SIGNALS$])
-m4trace:configure.ac:1703: -1- AH_OUTPUT([SYSV_SIGNALS], [/* Define if system supports SYSV signal interface */
+m4trace:configure.ac:1704: -1- AC_DEFINE_TRACE_LITERAL([SYSV_SIGNALS])
+m4trace:configure.ac:1704: -1- m4_pattern_allow([^SYSV_SIGNALS$])
+m4trace:configure.ac:1704: -1- AH_OUTPUT([SYSV_SIGNALS], [/* Define if system supports SYSV signal interface */
 @%:@undef SYSV_SIGNALS])
-m4trace:configure.ac:1714: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLOG])
-m4trace:configure.ac:1714: -1- m4_pattern_allow([^HAVE_SYSLOG$])
-m4trace:configure.ac:1714: -1- AH_OUTPUT([HAVE_SYSLOG], [/* Define if system supplies syslog() logging */
+m4trace:configure.ac:1715: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYSLOG])
+m4trace:configure.ac:1715: -1- m4_pattern_allow([^HAVE_SYSLOG$])
+m4trace:configure.ac:1715: -1- AH_OUTPUT([HAVE_SYSLOG], [/* Define if system supplies syslog() logging */
 @%:@undef HAVE_SYSLOG])
-m4trace:configure.ac:1736: -1- AC_DEFINE_TRACE_LITERAL([SYSTYPE])
-m4trace:configure.ac:1736: -1- m4_pattern_allow([^SYSTYPE$])
-m4trace:configure.ac:1736: -1- AH_OUTPUT([SYSTYPE], [/* Pine-Centric Host Specifier */
+m4trace:configure.ac:1737: -1- AC_DEFINE_TRACE_LITERAL([SYSTYPE])
+m4trace:configure.ac:1737: -1- m4_pattern_allow([^SYSTYPE$])
+m4trace:configure.ac:1737: -1- AH_OUTPUT([SYSTYPE], [/* Pine-Centric Host Specifier */
 @%:@undef SYSTYPE])
-m4trace:configure.ac:1737: -1- AC_DEFINE_TRACE_LITERAL([C_FILESEP])
-m4trace:configure.ac:1737: -1- m4_pattern_allow([^C_FILESEP$])
-m4trace:configure.ac:1737: -1- AH_OUTPUT([C_FILESEP], [/* File name separator as character constant */
+m4trace:configure.ac:1738: -1- AC_DEFINE_TRACE_LITERAL([C_FILESEP])
+m4trace:configure.ac:1738: -1- m4_pattern_allow([^C_FILESEP$])
+m4trace:configure.ac:1738: -1- AH_OUTPUT([C_FILESEP], [/* File name separator as character constant */
 @%:@undef C_FILESEP])
-m4trace:configure.ac:1738: -1- AC_DEFINE_TRACE_LITERAL([S_FILESEP])
-m4trace:configure.ac:1738: -1- m4_pattern_allow([^S_FILESEP$])
-m4trace:configure.ac:1738: -1- AH_OUTPUT([S_FILESEP], [/* File name separator as string constant */
+m4trace:configure.ac:1739: -1- AC_DEFINE_TRACE_LITERAL([S_FILESEP])
+m4trace:configure.ac:1739: -1- m4_pattern_allow([^S_FILESEP$])
+m4trace:configure.ac:1739: -1- AH_OUTPUT([S_FILESEP], [/* File name separator as string constant */
 @%:@undef S_FILESEP])
-m4trace:configure.ac:1739: -1- AC_DEFINE_TRACE_LITERAL([MAILDIR])
-m4trace:configure.ac:1739: -1- m4_pattern_allow([^MAILDIR$])
-m4trace:configure.ac:1739: -1- AH_OUTPUT([MAILDIR], [/* Path to local inboxes for pico newmail check */
+m4trace:configure.ac:1740: -1- AC_DEFINE_TRACE_LITERAL([MAILDIR])
+m4trace:configure.ac:1740: -1- m4_pattern_allow([^MAILDIR$])
+m4trace:configure.ac:1740: -1- AH_OUTPUT([MAILDIR], [/* Path to local inboxes for pico newmail check */
 @%:@undef MAILDIR])
-m4trace:configure.ac:1740: -1- AC_DEFINE_TRACE_LITERAL([MODE_READONLY])
-m4trace:configure.ac:1740: -1- m4_pattern_allow([^MODE_READONLY$])
-m4trace:configure.ac:1740: -1- AH_OUTPUT([MODE_READONLY], [/* File mode used to set readonly access */
+m4trace:configure.ac:1741: -1- AC_DEFINE_TRACE_LITERAL([MODE_READONLY])
+m4trace:configure.ac:1741: -1- m4_pattern_allow([^MODE_READONLY$])
+m4trace:configure.ac:1741: -1- AH_OUTPUT([MODE_READONLY], [/* File mode used to set readonly access */
 @%:@undef MODE_READONLY])
-m4trace:configure.ac:1743: -1- AC_SUBST([C_CLIENT_TARGET], [$alpine_c_client_target])
-m4trace:configure.ac:1743: -1- AC_SUBST_TRACE([C_CLIENT_TARGET])
-m4trace:configure.ac:1743: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
-m4trace:configure.ac:1744: -1- AC_SUBST([C_CLIENT_WITH_IPV6], [$c_client_ip6])
-m4trace:configure.ac:1744: -1- AC_SUBST_TRACE([C_CLIENT_WITH_IPV6])
-m4trace:configure.ac:1744: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
-m4trace:configure.ac:1761: -1- AC_DEFINE_TRACE_LITERAL([SMIME])
-m4trace:configure.ac:1761: -1- m4_pattern_allow([^SMIME$])
-m4trace:configure.ac:1761: -1- AH_OUTPUT([SMIME], [/* Enable S/MIME code */
+m4trace:configure.ac:1744: -1- AC_SUBST([C_CLIENT_TARGET], [$alpine_c_client_target])
+m4trace:configure.ac:1744: -1- AC_SUBST_TRACE([C_CLIENT_TARGET])
+m4trace:configure.ac:1744: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
+m4trace:configure.ac:1745: -1- AC_SUBST([C_CLIENT_WITH_IPV6], [$c_client_ip6])
+m4trace:configure.ac:1745: -1- AC_SUBST_TRACE([C_CLIENT_WITH_IPV6])
+m4trace:configure.ac:1745: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
+m4trace:configure.ac:1762: -1- AC_DEFINE_TRACE_LITERAL([SMIME])
+m4trace:configure.ac:1762: -1- m4_pattern_allow([^SMIME$])
+m4trace:configure.ac:1762: -1- AH_OUTPUT([SMIME], [/* Enable S/MIME code */
 @%:@undef SMIME])
-m4trace:configure.ac:1762: -1- AC_DEFINE_TRACE_LITERAL([SMIME_SSLCERTS])
-m4trace:configure.ac:1762: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
-m4trace:configure.ac:1762: -1- AH_OUTPUT([SMIME_SSLCERTS], [/* Directory where S/MIME CACerts are located */
+m4trace:configure.ac:1763: -1- AC_DEFINE_TRACE_LITERAL([SMIME_SSLCERTS])
+m4trace:configure.ac:1763: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
+m4trace:configure.ac:1763: -1- AH_OUTPUT([SMIME_SSLCERTS], [/* Directory where S/MIME CACerts are located */
 @%:@undef SMIME_SSLCERTS])
-m4trace:configure.ac:1814: -1- AC_SUBST([C_CLIENT_CFLAGS], [EXTRACFLAGS=\"$alpine_c_client_cflags\"])
-m4trace:configure.ac:1814: -1- AC_SUBST_TRACE([C_CLIENT_CFLAGS])
-m4trace:configure.ac:1814: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
-m4trace:configure.ac:1825: -1- AC_SUBST([C_CLIENT_LDFLAGS], [EXTRALDFLAGS=\"$alpine_c_client_ldflags\"])
-m4trace:configure.ac:1825: -1- AC_SUBST_TRACE([C_CLIENT_LDFLAGS])
-m4trace:configure.ac:1825: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
-m4trace:configure.ac:1829: -1- AC_SUBST([C_CLIENT_GCCOPTLEVEL], [GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\"])
-m4trace:configure.ac:1829: -1- AC_SUBST_TRACE([C_CLIENT_GCCOPTLEVEL])
-m4trace:configure.ac:1829: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
-m4trace:configure.ac:1832: -1- AC_SUBST([C_CLIENT_SPECIALS], [$c_client_specials])
-m4trace:configure.ac:1832: -1- AC_SUBST_TRACE([C_CLIENT_SPECIALS])
-m4trace:configure.ac:1832: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
-m4trace:configure.ac:1852: -1- AC_DEFINE_TRACE_LITERAL([PUBCOOKIE])
-m4trace:configure.ac:1852: -1- m4_pattern_allow([^PUBCOOKIE$])
-m4trace:configure.ac:1852: -1- AH_OUTPUT([PUBCOOKIE], [/* Include support for UW Pubcookie Web Authentication */
+m4trace:configure.ac:1815: -1- AC_SUBST([C_CLIENT_CFLAGS], [EXTRACFLAGS=\"$alpine_c_client_cflags\"])
+m4trace:configure.ac:1815: -1- AC_SUBST_TRACE([C_CLIENT_CFLAGS])
+m4trace:configure.ac:1815: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
+m4trace:configure.ac:1826: -1- AC_SUBST([C_CLIENT_LDFLAGS], [EXTRALDFLAGS=\"$alpine_c_client_ldflags\"])
+m4trace:configure.ac:1826: -1- AC_SUBST_TRACE([C_CLIENT_LDFLAGS])
+m4trace:configure.ac:1826: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
+m4trace:configure.ac:1830: -1- AC_SUBST([C_CLIENT_GCCOPTLEVEL], [GCCOPTLEVEL=\"$alpine_c_client_gccoptlevel\"])
+m4trace:configure.ac:1830: -1- AC_SUBST_TRACE([C_CLIENT_GCCOPTLEVEL])
+m4trace:configure.ac:1830: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
+m4trace:configure.ac:1833: -1- AC_SUBST([C_CLIENT_SPECIALS], [$c_client_specials])
+m4trace:configure.ac:1833: -1- AC_SUBST_TRACE([C_CLIENT_SPECIALS])
+m4trace:configure.ac:1833: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
+m4trace:configure.ac:1853: -1- AC_DEFINE_TRACE_LITERAL([PUBCOOKIE])
+m4trace:configure.ac:1853: -1- m4_pattern_allow([^PUBCOOKIE$])
+m4trace:configure.ac:1853: -1- AH_OUTPUT([PUBCOOKIE], [/* Include support for UW Pubcookie Web Authentication */
 @%:@undef PUBCOOKIE])
-m4trace:configure.ac:1859: -1- AC_SUBST([REGEX_BUILD])
-m4trace:configure.ac:1859: -1- AC_SUBST_TRACE([REGEX_BUILD])
-m4trace:configure.ac:1859: -1- m4_pattern_allow([^REGEX_BUILD$])
-m4trace:configure.ac:1861: -1- AC_SUBST([WEB_BUILD])
-m4trace:configure.ac:1861: -1- AC_SUBST_TRACE([WEB_BUILD])
-m4trace:configure.ac:1861: -1- m4_pattern_allow([^WEB_BUILD$])
-m4trace:configure.ac:1862: -1- AC_SUBST([WEB_BINDIR])
-m4trace:configure.ac:1862: -1- AC_SUBST_TRACE([WEB_BINDIR])
-m4trace:configure.ac:1862: -1- m4_pattern_allow([^WEB_BINDIR$])
-m4trace:configure.ac:1863: -1- AC_SUBST([WEB_PUBCOOKIE_BUILD])
-m4trace:configure.ac:1863: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_BUILD])
-m4trace:configure.ac:1863: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
-m4trace:configure.ac:1864: -1- AC_SUBST([WEB_PUBCOOKIE_LIB])
-m4trace:configure.ac:1864: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LIB])
-m4trace:configure.ac:1864: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
-m4trace:configure.ac:1865: -1- AC_SUBST([WEB_PUBCOOKIE_LINK])
-m4trace:configure.ac:1865: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LINK])
-m4trace:configure.ac:1865: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
-m4trace:configure.ac:1867: -1- AC_SUBST([AM_CFLAGS])
-m4trace:configure.ac:1867: -1- AC_SUBST_TRACE([AM_CFLAGS])
-m4trace:configure.ac:1867: -1- m4_pattern_allow([^AM_CFLAGS$])
-m4trace:configure.ac:1868: -1- AC_SUBST([AM_LDFLAGS])
-m4trace:configure.ac:1868: -1- AC_SUBST_TRACE([AM_LDFLAGS])
-m4trace:configure.ac:1868: -1- m4_pattern_allow([^AM_LDFLAGS$])
-m4trace:configure.ac:1870: -1- AC_CONFIG_FILES([m4/Makefile po/Makefile.in regex/Makefile \
+m4trace:configure.ac:1860: -1- AC_SUBST([REGEX_BUILD])
+m4trace:configure.ac:1860: -1- AC_SUBST_TRACE([REGEX_BUILD])
+m4trace:configure.ac:1860: -1- m4_pattern_allow([^REGEX_BUILD$])
+m4trace:configure.ac:1862: -1- AC_SUBST([WEB_BUILD])
+m4trace:configure.ac:1862: -1- AC_SUBST_TRACE([WEB_BUILD])
+m4trace:configure.ac:1862: -1- m4_pattern_allow([^WEB_BUILD$])
+m4trace:configure.ac:1863: -1- AC_SUBST([WEB_BINDIR])
+m4trace:configure.ac:1863: -1- AC_SUBST_TRACE([WEB_BINDIR])
+m4trace:configure.ac:1863: -1- m4_pattern_allow([^WEB_BINDIR$])
+m4trace:configure.ac:1864: -1- AC_SUBST([WEB_PUBCOOKIE_BUILD])
+m4trace:configure.ac:1864: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_BUILD])
+m4trace:configure.ac:1864: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
+m4trace:configure.ac:1865: -1- AC_SUBST([WEB_PUBCOOKIE_LIB])
+m4trace:configure.ac:1865: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LIB])
+m4trace:configure.ac:1865: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
+m4trace:configure.ac:1866: -1- AC_SUBST([WEB_PUBCOOKIE_LINK])
+m4trace:configure.ac:1866: -1- AC_SUBST_TRACE([WEB_PUBCOOKIE_LINK])
+m4trace:configure.ac:1866: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
+m4trace:configure.ac:1868: -1- AC_SUBST([AM_CFLAGS])
+m4trace:configure.ac:1868: -1- AC_SUBST_TRACE([AM_CFLAGS])
+m4trace:configure.ac:1868: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:1869: -1- AC_SUBST([AM_LDFLAGS])
+m4trace:configure.ac:1869: -1- AC_SUBST_TRACE([AM_LDFLAGS])
+m4trace:configure.ac:1869: -1- m4_pattern_allow([^AM_LDFLAGS$])
+m4trace:configure.ac:1871: -1- AC_CONFIG_FILES([m4/Makefile po/Makefile.in regex/Makefile \
 	  pith/osdep/Makefile pith/charconv/Makefile pith/Makefile \
 	  pico/osdep/Makefile pico/Makefile \
 	  alpine/osdep/Makefile alpine/Makefile \
 	  web/src/Makefile web/src/pubcookie/Makefile \
 	  web/src/alpined.d/Makefile \
 	  Makefile])
-m4trace:configure.ac:1877: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.ac:1877: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:1877: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.ac:1877: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:1877: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:1877: -1- AC_SUBST([am__EXEEXT_TRUE])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1877: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:1877: -1- AC_SUBST([am__EXEEXT_FALSE])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1877: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:1877: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1877: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1877: -2- m4_include([VERSION])
-m4trace:configure.ac:1877: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1877: -2- m4_include([VERSION])
-m4trace:configure.ac:1877: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([INSTALL])
-m4trace:configure.ac:1877: -1- AC_SUBST_TRACE([MKDIR_P])
-m4trace:configure.ac:1877: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
+m4trace:configure.ac:1878: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.ac:1878: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:1878: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.ac:1878: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:1878: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:1878: -1- AC_SUBST([am__EXEEXT_TRUE])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1878: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:1878: -1- AC_SUBST([am__EXEEXT_FALSE])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1878: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:1878: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1878: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1878: -2- m4_include([VERSION])
+m4trace:configure.ac:1878: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1878: -2- m4_include([VERSION])
+m4trace:configure.ac:1878: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.ac:1878: -1- AC_SUBST_TRACE([MKDIR_P])
+m4trace:configure.ac:1878: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
diff --git a/autom4te.cache/traces.2 b/autom4te.cache/traces.2
index 0cde3d33..3b96813d 100644
--- a/autom4te.cache/traces.2
+++ b/autom4te.cache/traces.2
@@ -5149,43 +5149,44 @@ m4trace:configure.ac:48: -1- m4_pattern_allow([^CPPFLAGS$])
 m4trace:configure.ac:48: -1- m4_pattern_allow([^CPP$])
 m4trace:configure.ac:48: -1- m4_pattern_allow([^STDC_HEADERS$])
 m4trace:configure.ac:48: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-m4trace:configure.ac:50: -1- m4_pattern_allow([^AR$])
-m4trace:configure.ac:51: -1- m4_pattern_allow([^RM$])
-m4trace:configure.ac:52: -1- m4_pattern_allow([^CP$])
-m4trace:configure.ac:53: -1- m4_pattern_allow([^LN$])
-m4trace:configure.ac:54: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:55: -1- m4_pattern_allow([^MAKE$])
-m4trace:configure.ac:59: -1- AM_GNU_GETTEXT_VERSION([0.16.1])
-m4trace:configure.ac:60: -1- AM_GNU_GETTEXT([external])
-m4trace:configure.ac:60: -1- AM_GNU_GETTEXT_NEED([])
-m4trace:configure.ac:60: -1- AM_PO_SUBDIRS
-m4trace:configure.ac:60: -1- AM_NLS
-m4trace:configure.ac:60: -1- m4_pattern_allow([^USE_NLS$])
-m4trace:configure.ac:60: -1- AM_PATH_PROG_WITH_TEST([MSGFMT], [msgfmt], [$ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
+m4trace:configure.ac:49: -1- m4_pattern_allow([^LIBTOOL_DEPS$])
+m4trace:configure.ac:51: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:52: -1- m4_pattern_allow([^RM$])
+m4trace:configure.ac:53: -1- m4_pattern_allow([^CP$])
+m4trace:configure.ac:54: -1- m4_pattern_allow([^LN$])
+m4trace:configure.ac:55: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:56: -1- m4_pattern_allow([^MAKE$])
+m4trace:configure.ac:60: -1- AM_GNU_GETTEXT_VERSION([0.16.1])
+m4trace:configure.ac:61: -1- AM_GNU_GETTEXT([external])
+m4trace:configure.ac:61: -1- AM_GNU_GETTEXT_NEED([])
+m4trace:configure.ac:61: -1- AM_PO_SUBDIRS
+m4trace:configure.ac:61: -1- AM_NLS
+m4trace:configure.ac:61: -1- m4_pattern_allow([^USE_NLS$])
+m4trace:configure.ac:61: -1- AM_PATH_PROG_WITH_TEST([MSGFMT], [msgfmt], [$ac_dir/$ac_word --statistics /dev/null >&5 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], [:])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^MSGFMT$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^GMSGFMT$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^MSGFMT_015$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^GMSGFMT_015$])
-m4trace:configure.ac:60: -1- AM_PATH_PROG_WITH_TEST([XGETTEXT], [xgettext], [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
+m4trace:configure.ac:61: -1- m4_pattern_allow([^MSGFMT$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^GMSGFMT$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^MSGFMT_015$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^GMSGFMT_015$])
+m4trace:configure.ac:61: -1- AM_PATH_PROG_WITH_TEST([XGETTEXT], [xgettext], [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&5 2>&1 &&
      (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], [:])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^XGETTEXT$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^XGETTEXT_015$])
-m4trace:configure.ac:60: -1- AM_PATH_PROG_WITH_TEST([MSGMERGE], [msgmerge], [$ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1], [:])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^MSGMERGE$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.ac:60: -1- AC_LIB_PREPARE_PREFIX
-m4trace:configure.ac:60: -1- AC_LIB_RPATH
-m4trace:configure.ac:60: -1- AC_LIB_PROG_LD
-m4trace:configure.ac:60: -1- AC_LIB_PROG_LD_GNU
-m4trace:configure.ac:60: -1- AM_ICONV_LINKFLAGS_BODY
-m4trace:configure.ac:60: -1- AC_LIB_LINKFLAGS_BODY([iconv])
-m4trace:configure.ac:60: -1- AC_LIB_PREPARE_MULTILIB
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([
+m4trace:configure.ac:61: -1- m4_pattern_allow([^XGETTEXT$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^XGETTEXT_015$])
+m4trace:configure.ac:61: -1- AM_PATH_PROG_WITH_TEST([MSGMERGE], [msgmerge], [$ac_dir/$ac_word --update -q /dev/null /dev/null >&5 2>&1], [:])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^MSGMERGE$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.ac:61: -1- AC_LIB_PREPARE_PREFIX
+m4trace:configure.ac:61: -1- AC_LIB_RPATH
+m4trace:configure.ac:61: -1- AC_LIB_PROG_LD
+m4trace:configure.ac:61: -1- AC_LIB_PROG_LD_GNU
+m4trace:configure.ac:61: -1- AM_ICONV_LINKFLAGS_BODY
+m4trace:configure.ac:61: -1- AC_LIB_LINKFLAGS_BODY([iconv])
+m4trace:configure.ac:61: -1- AC_LIB_PREPARE_MULTILIB
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   ])
-m4trace:configure.ac:60: -1- AC_LIB_ARG_WITH([libiconv-prefix], [  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
+m4trace:configure.ac:61: -1- AC_LIB_ARG_WITH([libiconv-prefix], [  --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir], [
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -5201,70 +5202,70 @@ m4trace:configure.ac:60: -1- AC_LIB_ARG_WITH([libiconv-prefix], [  --with-libico
       fi
     fi
 ])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
         ])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- gt_INTL_MACOSX
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- gt_INTL_MACOSX
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:367: gt_INTL_MACOSX is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_CFPREFERENCESCOPYAPPVALUE$])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_CFPREFERENCESCOPYAPPVALUE$])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:367: gt_INTL_MACOSX is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_CFLOCALECOPYCURRENT$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^INTL_MACOSX_LIBS$])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_CFLOCALECOPYCURRENT$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^INTL_MACOSX_LIBS$])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- AM_ICONV_LINK
-m4trace:configure.ac:60: -1- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- AM_ICONV_LINK
+m4trace:configure.ac:61: -1- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/iconv.m4:20: AM_ICONV_LINK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/iconv.m4:20: AM_ICONV_LINK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_ICONV$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^LIBICONV$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^LTLIBICONV$])
-m4trace:configure.ac:60: -1- AC_LIB_LINKFLAGS_BODY([intl])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_ICONV$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^LIBICONV$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^LTLIBICONV$])
+m4trace:configure.ac:61: -1- AC_LIB_LINKFLAGS_BODY([intl])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([
     eval additional_includedir=\"$includedir\"
     eval additional_libdir=\"$libdir\"
   ])
-m4trace:configure.ac:60: -1- AC_LIB_ARG_WITH([libintl-prefix], [  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
+m4trace:configure.ac:61: -1- AC_LIB_ARG_WITH([libintl-prefix], [  --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir], [
     if test "X$withval" = "Xno"; then
       use_additional=no
@@ -5280,72 +5281,72 @@ m4trace:configure.ac:60: -1- AC_LIB_ARG_WITH([libintl-prefix], [  --with-libintl
       fi
     fi
 ])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([
           eval additional_includedir=\"$includedir\"
           eval additional_libdir=\"$libdir\"
         ])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/general.m4:2031: AC_CACHE_VAL is expanded from...
 ../../lib/autoconf/general.m4:2052: AC_CACHE_CHECK is expanded from...
 m4/gettext.m4:57: AM_GNU_GETTEXT is expanded from...
-configure.ac:60: the top level])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^ENABLE_NLS$])
-m4trace:configure.ac:60: -1- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
-m4trace:configure.ac:60: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_GETTEXT$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_DCGETTEXT$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^INTLLIBS$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^LIBINTL$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^LTLIBINTL$])
-m4trace:configure.ac:60: -1- m4_pattern_allow([^POSUB$])
-m4trace:configure.ac:83: -1- m4_pattern_allow([^ENABLE_DMALLOC$])
-m4trace:configure.ac:100: -1- m4_pattern_allow([^localedir$])
-m4trace:configure.ac:191: -1- m4_pattern_allow([^DEBUG$])
-m4trace:configure.ac:192: -1- m4_pattern_allow([^DEBUGJOURNAL$])
-m4trace:configure.ac:214: -1- m4_pattern_allow([^MOUSE$])
-m4trace:configure.ac:224: -1- m4_pattern_allow([^USE_QUOTAS$])
-m4trace:configure.ac:235: -1- m4_pattern_allow([^NEVER_ALLOW_CHANGING_FROM$])
-m4trace:configure.ac:243: -1- m4_pattern_allow([^BACKGROUND_POST$])
-m4trace:configure.ac:253: -1- m4_pattern_allow([^KEYBOARD_LOCK$])
-m4trace:configure.ac:263: -1- m4_pattern_allow([^ENCODE_FROMS$])
-m4trace:configure.ac:271: -1- m4_pattern_allow([^SENDMAIL$])
-m4trace:configure.ac:271: -1- m4_pattern_allow([^SENDMAIL$])
-m4trace:configure.ac:289: -1- m4_pattern_allow([^SENDMAIL$])
-m4trace:configure.ac:301: -1- m4_pattern_allow([^SENDMAILFLAGS$])
-m4trace:configure.ac:305: -1- m4_pattern_allow([^NPA_PROG$])
-m4trace:configure.ac:305: -1- m4_pattern_allow([^NPA_PROG$])
-m4trace:configure.ac:332: -1- m4_pattern_allow([^SENDNEWS$])
-m4trace:configure.ac:336: -1- m4_pattern_allow([^PWPROG$])
-m4trace:configure.ac:336: -1- m4_pattern_allow([^PWPROG$])
-m4trace:configure.ac:336: -1- m4_pattern_allow([^PWPROG$])
-m4trace:configure.ac:354: -1- m4_pattern_allow([^PASSWD_PROG$])
-m4trace:configure.ac:358: -1- m4_pattern_allow([^SPELLPROG$])
-m4trace:configure.ac:358: -1- m4_pattern_allow([^SPELLPROG$])
-m4trace:configure.ac:358: -1- m4_pattern_allow([^SPELLPROG$])
-m4trace:configure.ac:379: -1- m4_pattern_allow([^alpine_simple_spellcheck$])
-m4trace:configure.ac:398: -1- m4_pattern_allow([^ISPELLPROG$])
-m4trace:configure.ac:398: -1- m4_pattern_allow([^ISPELLPROG$])
-m4trace:configure.ac:416: -1- m4_pattern_allow([^alpine_interactive_spellcheck$])
-m4trace:configure.ac:429: -1- m4_pattern_allow([^DF_VAR_SPELLER$])
-m4trace:configure.ac:435: -1- m4_pattern_allow([^SPELLER$])
-m4trace:configure.ac:458: -1- m4_pattern_allow([^SYSTEM_PINERC$])
-m4trace:configure.ac:481: -1- m4_pattern_allow([^SYSTEM_PINERC_FIXED$])
-m4trace:configure.ac:505: -1- m4_pattern_allow([^SYSTEM_PINE_INFO_PATH$])
-m4trace:configure.ac:509: -1- AC_DEFUN([PINEVAR], [
+configure.ac:61: the top level])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^ENABLE_NLS$])
+m4trace:configure.ac:61: -1- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+m4trace:configure.ac:61: -1- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_GETTEXT$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^HAVE_DCGETTEXT$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^INTLLIBS$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^LIBINTL$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^LTLIBINTL$])
+m4trace:configure.ac:61: -1- m4_pattern_allow([^POSUB$])
+m4trace:configure.ac:84: -1- m4_pattern_allow([^ENABLE_DMALLOC$])
+m4trace:configure.ac:101: -1- m4_pattern_allow([^localedir$])
+m4trace:configure.ac:192: -1- m4_pattern_allow([^DEBUG$])
+m4trace:configure.ac:193: -1- m4_pattern_allow([^DEBUGJOURNAL$])
+m4trace:configure.ac:215: -1- m4_pattern_allow([^MOUSE$])
+m4trace:configure.ac:225: -1- m4_pattern_allow([^USE_QUOTAS$])
+m4trace:configure.ac:236: -1- m4_pattern_allow([^NEVER_ALLOW_CHANGING_FROM$])
+m4trace:configure.ac:244: -1- m4_pattern_allow([^BACKGROUND_POST$])
+m4trace:configure.ac:254: -1- m4_pattern_allow([^KEYBOARD_LOCK$])
+m4trace:configure.ac:264: -1- m4_pattern_allow([^ENCODE_FROMS$])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^SENDMAIL$])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^SENDMAIL$])
+m4trace:configure.ac:290: -1- m4_pattern_allow([^SENDMAIL$])
+m4trace:configure.ac:302: -1- m4_pattern_allow([^SENDMAILFLAGS$])
+m4trace:configure.ac:306: -1- m4_pattern_allow([^NPA_PROG$])
+m4trace:configure.ac:306: -1- m4_pattern_allow([^NPA_PROG$])
+m4trace:configure.ac:333: -1- m4_pattern_allow([^SENDNEWS$])
+m4trace:configure.ac:337: -1- m4_pattern_allow([^PWPROG$])
+m4trace:configure.ac:337: -1- m4_pattern_allow([^PWPROG$])
+m4trace:configure.ac:337: -1- m4_pattern_allow([^PWPROG$])
+m4trace:configure.ac:355: -1- m4_pattern_allow([^PASSWD_PROG$])
+m4trace:configure.ac:359: -1- m4_pattern_allow([^SPELLPROG$])
+m4trace:configure.ac:359: -1- m4_pattern_allow([^SPELLPROG$])
+m4trace:configure.ac:359: -1- m4_pattern_allow([^SPELLPROG$])
+m4trace:configure.ac:380: -1- m4_pattern_allow([^alpine_simple_spellcheck$])
+m4trace:configure.ac:399: -1- m4_pattern_allow([^ISPELLPROG$])
+m4trace:configure.ac:399: -1- m4_pattern_allow([^ISPELLPROG$])
+m4trace:configure.ac:417: -1- m4_pattern_allow([^alpine_interactive_spellcheck$])
+m4trace:configure.ac:430: -1- m4_pattern_allow([^DF_VAR_SPELLER$])
+m4trace:configure.ac:436: -1- m4_pattern_allow([^SPELLER$])
+m4trace:configure.ac:459: -1- m4_pattern_allow([^SYSTEM_PINERC$])
+m4trace:configure.ac:482: -1- m4_pattern_allow([^SYSTEM_PINERC_FIXED$])
+m4trace:configure.ac:506: -1- m4_pattern_allow([^SYSTEM_PINE_INFO_PATH$])
+m4trace:configure.ac:510: -1- AC_DEFUN([PINEVAR], [
     dpv=$3
     AC_ARG_WITH($1,
       AS_HELP_STRING([--with-$1=VALUE],[$4 ($3)]),
@@ -5356,7 +5357,7 @@ m4trace:configure.ac:509: -1- AC_DEFUN([PINEVAR], [
       ])
     AC_DEFINE_UNQUOTED($2, "$dpv", [Default configuration value])
   ])
-m4trace:configure.ac:524: -1- AC_DEFUN([PINEVAR_UNQUOTED], [
+m4trace:configure.ac:525: -1- AC_DEFUN([PINEVAR_UNQUOTED], [
     dpv=$3
     AC_ARG_WITH($1,
       AS_HELP_STRING([--with-$1=VALUE],[$4 ($3)]),
@@ -5367,116 +5368,116 @@ m4trace:configure.ac:524: -1- AC_DEFUN([PINEVAR_UNQUOTED], [
       ])
     AC_DEFINE_UNQUOTED($2, $dpv, [Default configuration value])
   ])
-m4trace:configure.ac:537: -1- PINEVAR([mailcheck-interval], [DF_MAILCHECK], [150], [Specify default mail-check-interval])
-m4trace:configure.ac:537: -1- m4_pattern_allow([^DF_MAILCHECK$])
-m4trace:configure.ac:538: -1- PINEVAR_UNQUOTED([checkpoint-interval], [CHECK_POINT_TIME], [420], [Specify default checkpoint-interval])
-m4trace:configure.ac:538: -1- m4_pattern_allow([^CHECK_POINT_TIME$])
-m4trace:configure.ac:539: -1- PINEVAR_UNQUOTED([checkpoint-frequency], [CHECK_POINT_FREQ], [12], [State change count before checkpoint])
-m4trace:configure.ac:539: -1- m4_pattern_allow([^CHECK_POINT_FREQ$])
-m4trace:configure.ac:540: -1- PINEVAR_UNQUOTED([display-rows], [DEFAULT_LINES_ON_TERMINAL], [24], [Initial rows on display])
-m4trace:configure.ac:540: -1- m4_pattern_allow([^DEFAULT_LINES_ON_TERMINAL$])
-m4trace:configure.ac:541: -1- PINEVAR_UNQUOTED([display-columns], [DEFAULT_COLUMNS_ON_TERMINAL], [80], [Initial columns on display])
-m4trace:configure.ac:541: -1- m4_pattern_allow([^DEFAULT_COLUMNS_ON_TERMINAL$])
-m4trace:configure.ac:542: -1- PINEVAR_UNQUOTED([max-display-rows], [MAX_SCREEN_ROWS], [200], [Maximum display rows])
-m4trace:configure.ac:542: -1- m4_pattern_allow([^MAX_SCREEN_ROWS$])
-m4trace:configure.ac:543: -1- PINEVAR_UNQUOTED([max-display-columns], [MAX_SCREEN_COLS], [500], [Maximum display columns])
-m4trace:configure.ac:543: -1- m4_pattern_allow([^MAX_SCREEN_COLS$])
-m4trace:configure.ac:544: -1- PINEVAR([fill-column], [DF_FILLCOL], [74], [Default fill column])
-m4trace:configure.ac:544: -1- m4_pattern_allow([^DF_FILLCOL$])
-m4trace:configure.ac:545: -1- PINEVAR_UNQUOTED([max_fill-column], [MAX_FILLCOL], [80], [Maximum fill column])
-m4trace:configure.ac:545: -1- m4_pattern_allow([^MAX_FILLCOL$])
-m4trace:configure.ac:546: -1- PINEVAR_UNQUOTED([debug-level], [DEFAULT_DEBUG], [2], [Specify default debug verbosity level])
-m4trace:configure.ac:546: -1- m4_pattern_allow([^DEFAULT_DEBUG$])
-m4trace:configure.ac:547: -1- PINEVAR_UNQUOTED([debug-files], [NUMDEBUGFILES], [4], [Specify number of debug files])
-m4trace:configure.ac:547: -1- m4_pattern_allow([^NUMDEBUGFILES$])
-m4trace:configure.ac:548: -1- PINEVAR([debug-file], [DEBUGFILE], [.pine-debug], [Specify debug file name])
-m4trace:configure.ac:548: -1- m4_pattern_allow([^DEBUGFILE$])
-m4trace:configure.ac:549: -1- PINEVAR([forwarded-keyword], [FORWARDED_FLAG], ["\$Forwarded"], [IMAP (c-client) keyword to store forwarded status])
-m4trace:configure.ac:549: -1- m4_pattern_allow([^FORWARDED_FLAG$])
-m4trace:configure.ac:550: -1- PINEVAR([display-overlap], [DF_OVERLAP], [2], [Lines preserved while paging])
-m4trace:configure.ac:550: -1- m4_pattern_allow([^DF_OVERLAP$])
-m4trace:configure.ac:551: -1- PINEVAR([display-margin], [DF_MARGIN], [0], [Lines visible while scrolling])
-m4trace:configure.ac:551: -1- m4_pattern_allow([^DF_MARGIN$])
-m4trace:configure.ac:552: -1- PINEVAR([default-fcc], [DF_DEFAULT_FCC], [sent-mail], [Default sent mail folder])
-m4trace:configure.ac:552: -1- m4_pattern_allow([^DF_DEFAULT_FCC$])
-m4trace:configure.ac:553: -1- PINEVAR([default-save-folder], [DEFAULT_SAVE], [saved-messages], [Default save folder])
-m4trace:configure.ac:553: -1- m4_pattern_allow([^DEFAULT_SAVE$])
-m4trace:configure.ac:554: -1- PINEVAR([default-legacy-postponed-folder], [POSTPONED_MAIL], [postponed-mail], [Pre Pine 3.90 postponed folder])
-m4trace:configure.ac:554: -1- m4_pattern_allow([^POSTPONED_MAIL$])
-m4trace:configure.ac:555: -1- PINEVAR([default-postponed-folder], [POSTPONED_MSGS], [postponed-msgs], [Default postponed folder])
-m4trace:configure.ac:555: -1- m4_pattern_allow([^POSTPONED_MSGS$])
-m4trace:configure.ac:556: -1- PINEVAR([default-trash-folder], [TRASH_FOLDER], [Trash], [Default Trash folder for Web Alpine])
-m4trace:configure.ac:556: -1- m4_pattern_allow([^TRASH_FOLDER$])
-m4trace:configure.ac:557: -1- PINEVAR([default-interrupted-mail], [INTERRUPTED_MAIL], [.pine-interrupted-mail], [Default folder for interrupted mail])
-m4trace:configure.ac:557: -1- m4_pattern_allow([^INTERRUPTED_MAIL$])
-m4trace:configure.ac:558: -1- PINEVAR([default-dead-letter-folder], [DEADLETTER], [dead.letter], [Default dead letter folder])
-m4trace:configure.ac:558: -1- m4_pattern_allow([^DEADLETTER$])
-m4trace:configure.ac:559: -1- PINEVAR([default-mail-directory], [DF_MAIL_DIRECTORY], [mail], [Default mail directory])
-m4trace:configure.ac:559: -1- m4_pattern_allow([^DF_MAIL_DIRECTORY$])
-m4trace:configure.ac:560: -1- PINEVAR([default-inbox-name], [INBOX_NAME], [INBOX], [Default inbox name])
-m4trace:configure.ac:560: -1- m4_pattern_allow([^INBOX_NAME$])
-m4trace:configure.ac:561: -1- PINEVAR([default-signature-file], [DF_SIGNATURE_FILE], [.signature], [Default signature file])
-m4trace:configure.ac:561: -1- m4_pattern_allow([^DF_SIGNATURE_FILE$])
-m4trace:configure.ac:562: -1- PINEVAR([default-elm-style-save], [DF_ELM_STYLE_SAVE], [no], [Default to Elm style save])
-m4trace:configure.ac:562: -1- m4_pattern_allow([^DF_ELM_STYLE_SAVE$])
-m4trace:configure.ac:563: -1- PINEVAR([default-header-in-reply], [DF_HEADER_IN_REPLY], [no], [Include header in reply])
-m4trace:configure.ac:563: -1- m4_pattern_allow([^DF_HEADER_IN_REPLY$])
-m4trace:configure.ac:564: -1- PINEVAR([default-old-style-reply], [DF_OLD_STYLE_REPLY], [no], [Default to old style reply])
-m4trace:configure.ac:564: -1- m4_pattern_allow([^DF_OLD_STYLE_REPLY$])
-m4trace:configure.ac:565: -1- PINEVAR([default-use-only-domain-name], [DF_USE_ONLY_DOMAIN_NAME], [no], [Default to using only the domain name])
-m4trace:configure.ac:565: -1- m4_pattern_allow([^DF_USE_ONLY_DOMAIN_NAME$])
-m4trace:configure.ac:566: -1- PINEVAR([default-save-by-sender], [DF_SAVE_BY_SENDER], [no], [Default to save by sender])
-m4trace:configure.ac:566: -1- m4_pattern_allow([^DF_SAVE_BY_SENDER$])
-m4trace:configure.ac:567: -1- PINEVAR([default-sort-key], [DF_SORT_KEY], [arrival], [Default sort key])
-m4trace:configure.ac:567: -1- m4_pattern_allow([^DF_SORT_KEY$])
-m4trace:configure.ac:568: -1- PINEVAR([default-addressbook-sort-rule], [DF_AB_SORT_RULE], [fullname-with-lists-last], [Default addressbook sort rule])
-m4trace:configure.ac:568: -1- m4_pattern_allow([^DF_AB_SORT_RULE$])
-m4trace:configure.ac:569: -1- PINEVAR([default-folder-sort-rule], [DF_FLD_SORT_RULE], [alphabetical], [Default folder sort rule])
-m4trace:configure.ac:569: -1- m4_pattern_allow([^DF_FLD_SORT_RULE$])
-m4trace:configure.ac:570: -1- PINEVAR([default-saved-message-name-rule], [DF_SAVED_MSG_NAME_RULE], [default-folder], [Default saved message name rule])
-m4trace:configure.ac:570: -1- m4_pattern_allow([^DF_SAVED_MSG_NAME_RULE$])
-m4trace:configure.ac:571: -1- PINEVAR([default-fcc-rule], [DF_FCC_RULE], [default-fcc], [Default fcc rule])
-m4trace:configure.ac:571: -1- m4_pattern_allow([^DF_FCC_RULE$])
-m4trace:configure.ac:572: -1- PINEVAR([default-standard-printer], [DF_STANDARD_PRINTER], [lpr], [Default standard printern])
-m4trace:configure.ac:572: -1- m4_pattern_allow([^DF_STANDARD_PRINTER$])
-m4trace:configure.ac:573: -1- PINEVAR([default-ansi-printer], [ANSI_PRINTER], [attached-to-ansi], [ANSI printer definition])
-m4trace:configure.ac:573: -1- m4_pattern_allow([^ANSI_PRINTER$])
-m4trace:configure.ac:574: -1- PINEVAR([default-addressbook], [DF_ADDRESSBOOK], [.addressbook], [Default addressbook name])
-m4trace:configure.ac:574: -1- m4_pattern_allow([^DF_ADDRESSBOOK$])
-m4trace:configure.ac:575: -1- PINEVAR([default-local-fullname], [DF_LOCAL_FULLNAME], ["Local Support"], [Default local support fullname])
-m4trace:configure.ac:575: -1- m4_pattern_allow([^DF_LOCAL_FULLNAME$])
-m4trace:configure.ac:576: -1- PINEVAR([default-local-address], [DF_LOCAL_ADDRESS], [postmaster], [Default local support address])
-m4trace:configure.ac:576: -1- m4_pattern_allow([^DF_LOCAL_ADDRESS$])
-m4trace:configure.ac:577: -1- PINEVAR([default-keyboard-lock-count], [DF_KBLOCK_PASSWD_COUNT], [1], [Default keyboard lock count])
-m4trace:configure.ac:577: -1- m4_pattern_allow([^DF_KBLOCK_PASSWD_COUNT$])
-m4trace:configure.ac:578: -1- PINEVAR([default-remote-addressbook-history], [DF_REMOTE_ABOOK_HISTORY], [3], [Default address book history count])
-m4trace:configure.ac:578: -1- m4_pattern_allow([^DF_REMOTE_ABOOK_HISTORY$])
-m4trace:configure.ac:579: -1- PINEVAR([smime-public-cert-directory], [DF_PUBLICCERT_DIR], [.alpine-smime/public], [Default Public Cert Directory])
-m4trace:configure.ac:579: -1- m4_pattern_allow([^DF_PUBLICCERT_DIR$])
-m4trace:configure.ac:580: -1- PINEVAR([smime-private-key-directory], [DF_PRIVATEKEY_DIR], [.alpine-smime/private], [Default Private Key Directory])
-m4trace:configure.ac:580: -1- m4_pattern_allow([^DF_PRIVATEKEY_DIR$])
-m4trace:configure.ac:581: -1- PINEVAR([smime-cacert-directory], [DF_CACERT_DIR], [.alpine-smime/ca], [Default Cert Authority Directory])
-m4trace:configure.ac:581: -1- m4_pattern_allow([^DF_CACERT_DIR$])
-m4trace:configure.ac:582: -1- PINEVAR_UNQUOTED([default-printer], [DF_DEFAULT_PRINTER], [ANSI_PRINTER], [Default printer])
-m4trace:configure.ac:582: -1- m4_pattern_allow([^DF_DEFAULT_PRINTER$])
-m4trace:configure.ac:622: -1- m4_pattern_allow([^PASSFILE$])
-m4trace:configure.ac:626: -1- m4_pattern_allow([^DF_SSHPATH$])
-m4trace:configure.ac:641: -1- m4_pattern_allow([^DF_SSHCMD$])
-m4trace:configure.ac:998: -1- m4_pattern_allow([^OSX_TARGET$])
-m4trace:configure.ac:1003: -1- m4_pattern_allow([^APPLEKEYCHAIN$])
-m4trace:configure.ac:1035: -1- m4_pattern_allow([^__EXTENSIONS__$])
-m4trace:configure.ac:1166: -1- m4_pattern_allow([^_WINDOWS$])
-m4trace:configure.ac:1241: -1- m4_pattern_allow([^HAS_TERMINFO$])
-m4trace:configure.ac:1244: -1- m4_pattern_allow([^HAS_TERMCAP$])
-m4trace:configure.ac:1268: -1- m4_pattern_allow([^ENABLE_LDAP$])
-m4trace:configure.ac:1273: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
-m4trace:configure.ac:1437: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [../../lib/autoconf/general.m4:2777: AC_CHECK_FILE is expanded from...
+m4trace:configure.ac:538: -1- PINEVAR([mailcheck-interval], [DF_MAILCHECK], [150], [Specify default mail-check-interval])
+m4trace:configure.ac:538: -1- m4_pattern_allow([^DF_MAILCHECK$])
+m4trace:configure.ac:539: -1- PINEVAR_UNQUOTED([checkpoint-interval], [CHECK_POINT_TIME], [420], [Specify default checkpoint-interval])
+m4trace:configure.ac:539: -1- m4_pattern_allow([^CHECK_POINT_TIME$])
+m4trace:configure.ac:540: -1- PINEVAR_UNQUOTED([checkpoint-frequency], [CHECK_POINT_FREQ], [12], [State change count before checkpoint])
+m4trace:configure.ac:540: -1- m4_pattern_allow([^CHECK_POINT_FREQ$])
+m4trace:configure.ac:541: -1- PINEVAR_UNQUOTED([display-rows], [DEFAULT_LINES_ON_TERMINAL], [24], [Initial rows on display])
+m4trace:configure.ac:541: -1- m4_pattern_allow([^DEFAULT_LINES_ON_TERMINAL$])
+m4trace:configure.ac:542: -1- PINEVAR_UNQUOTED([display-columns], [DEFAULT_COLUMNS_ON_TERMINAL], [80], [Initial columns on display])
+m4trace:configure.ac:542: -1- m4_pattern_allow([^DEFAULT_COLUMNS_ON_TERMINAL$])
+m4trace:configure.ac:543: -1- PINEVAR_UNQUOTED([max-display-rows], [MAX_SCREEN_ROWS], [200], [Maximum display rows])
+m4trace:configure.ac:543: -1- m4_pattern_allow([^MAX_SCREEN_ROWS$])
+m4trace:configure.ac:544: -1- PINEVAR_UNQUOTED([max-display-columns], [MAX_SCREEN_COLS], [500], [Maximum display columns])
+m4trace:configure.ac:544: -1- m4_pattern_allow([^MAX_SCREEN_COLS$])
+m4trace:configure.ac:545: -1- PINEVAR([fill-column], [DF_FILLCOL], [74], [Default fill column])
+m4trace:configure.ac:545: -1- m4_pattern_allow([^DF_FILLCOL$])
+m4trace:configure.ac:546: -1- PINEVAR_UNQUOTED([max_fill-column], [MAX_FILLCOL], [80], [Maximum fill column])
+m4trace:configure.ac:546: -1- m4_pattern_allow([^MAX_FILLCOL$])
+m4trace:configure.ac:547: -1- PINEVAR_UNQUOTED([debug-level], [DEFAULT_DEBUG], [2], [Specify default debug verbosity level])
+m4trace:configure.ac:547: -1- m4_pattern_allow([^DEFAULT_DEBUG$])
+m4trace:configure.ac:548: -1- PINEVAR_UNQUOTED([debug-files], [NUMDEBUGFILES], [4], [Specify number of debug files])
+m4trace:configure.ac:548: -1- m4_pattern_allow([^NUMDEBUGFILES$])
+m4trace:configure.ac:549: -1- PINEVAR([debug-file], [DEBUGFILE], [.pine-debug], [Specify debug file name])
+m4trace:configure.ac:549: -1- m4_pattern_allow([^DEBUGFILE$])
+m4trace:configure.ac:550: -1- PINEVAR([forwarded-keyword], [FORWARDED_FLAG], ["\$Forwarded"], [IMAP (c-client) keyword to store forwarded status])
+m4trace:configure.ac:550: -1- m4_pattern_allow([^FORWARDED_FLAG$])
+m4trace:configure.ac:551: -1- PINEVAR([display-overlap], [DF_OVERLAP], [2], [Lines preserved while paging])
+m4trace:configure.ac:551: -1- m4_pattern_allow([^DF_OVERLAP$])
+m4trace:configure.ac:552: -1- PINEVAR([display-margin], [DF_MARGIN], [0], [Lines visible while scrolling])
+m4trace:configure.ac:552: -1- m4_pattern_allow([^DF_MARGIN$])
+m4trace:configure.ac:553: -1- PINEVAR([default-fcc], [DF_DEFAULT_FCC], [sent-mail], [Default sent mail folder])
+m4trace:configure.ac:553: -1- m4_pattern_allow([^DF_DEFAULT_FCC$])
+m4trace:configure.ac:554: -1- PINEVAR([default-save-folder], [DEFAULT_SAVE], [saved-messages], [Default save folder])
+m4trace:configure.ac:554: -1- m4_pattern_allow([^DEFAULT_SAVE$])
+m4trace:configure.ac:555: -1- PINEVAR([default-legacy-postponed-folder], [POSTPONED_MAIL], [postponed-mail], [Pre Pine 3.90 postponed folder])
+m4trace:configure.ac:555: -1- m4_pattern_allow([^POSTPONED_MAIL$])
+m4trace:configure.ac:556: -1- PINEVAR([default-postponed-folder], [POSTPONED_MSGS], [postponed-msgs], [Default postponed folder])
+m4trace:configure.ac:556: -1- m4_pattern_allow([^POSTPONED_MSGS$])
+m4trace:configure.ac:557: -1- PINEVAR([default-trash-folder], [TRASH_FOLDER], [Trash], [Default Trash folder for Web Alpine])
+m4trace:configure.ac:557: -1- m4_pattern_allow([^TRASH_FOLDER$])
+m4trace:configure.ac:558: -1- PINEVAR([default-interrupted-mail], [INTERRUPTED_MAIL], [.pine-interrupted-mail], [Default folder for interrupted mail])
+m4trace:configure.ac:558: -1- m4_pattern_allow([^INTERRUPTED_MAIL$])
+m4trace:configure.ac:559: -1- PINEVAR([default-dead-letter-folder], [DEADLETTER], [dead.letter], [Default dead letter folder])
+m4trace:configure.ac:559: -1- m4_pattern_allow([^DEADLETTER$])
+m4trace:configure.ac:560: -1- PINEVAR([default-mail-directory], [DF_MAIL_DIRECTORY], [mail], [Default mail directory])
+m4trace:configure.ac:560: -1- m4_pattern_allow([^DF_MAIL_DIRECTORY$])
+m4trace:configure.ac:561: -1- PINEVAR([default-inbox-name], [INBOX_NAME], [INBOX], [Default inbox name])
+m4trace:configure.ac:561: -1- m4_pattern_allow([^INBOX_NAME$])
+m4trace:configure.ac:562: -1- PINEVAR([default-signature-file], [DF_SIGNATURE_FILE], [.signature], [Default signature file])
+m4trace:configure.ac:562: -1- m4_pattern_allow([^DF_SIGNATURE_FILE$])
+m4trace:configure.ac:563: -1- PINEVAR([default-elm-style-save], [DF_ELM_STYLE_SAVE], [no], [Default to Elm style save])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^DF_ELM_STYLE_SAVE$])
+m4trace:configure.ac:564: -1- PINEVAR([default-header-in-reply], [DF_HEADER_IN_REPLY], [no], [Include header in reply])
+m4trace:configure.ac:564: -1- m4_pattern_allow([^DF_HEADER_IN_REPLY$])
+m4trace:configure.ac:565: -1- PINEVAR([default-old-style-reply], [DF_OLD_STYLE_REPLY], [no], [Default to old style reply])
+m4trace:configure.ac:565: -1- m4_pattern_allow([^DF_OLD_STYLE_REPLY$])
+m4trace:configure.ac:566: -1- PINEVAR([default-use-only-domain-name], [DF_USE_ONLY_DOMAIN_NAME], [no], [Default to using only the domain name])
+m4trace:configure.ac:566: -1- m4_pattern_allow([^DF_USE_ONLY_DOMAIN_NAME$])
+m4trace:configure.ac:567: -1- PINEVAR([default-save-by-sender], [DF_SAVE_BY_SENDER], [no], [Default to save by sender])
+m4trace:configure.ac:567: -1- m4_pattern_allow([^DF_SAVE_BY_SENDER$])
+m4trace:configure.ac:568: -1- PINEVAR([default-sort-key], [DF_SORT_KEY], [arrival], [Default sort key])
+m4trace:configure.ac:568: -1- m4_pattern_allow([^DF_SORT_KEY$])
+m4trace:configure.ac:569: -1- PINEVAR([default-addressbook-sort-rule], [DF_AB_SORT_RULE], [fullname-with-lists-last], [Default addressbook sort rule])
+m4trace:configure.ac:569: -1- m4_pattern_allow([^DF_AB_SORT_RULE$])
+m4trace:configure.ac:570: -1- PINEVAR([default-folder-sort-rule], [DF_FLD_SORT_RULE], [alphabetical], [Default folder sort rule])
+m4trace:configure.ac:570: -1- m4_pattern_allow([^DF_FLD_SORT_RULE$])
+m4trace:configure.ac:571: -1- PINEVAR([default-saved-message-name-rule], [DF_SAVED_MSG_NAME_RULE], [default-folder], [Default saved message name rule])
+m4trace:configure.ac:571: -1- m4_pattern_allow([^DF_SAVED_MSG_NAME_RULE$])
+m4trace:configure.ac:572: -1- PINEVAR([default-fcc-rule], [DF_FCC_RULE], [default-fcc], [Default fcc rule])
+m4trace:configure.ac:572: -1- m4_pattern_allow([^DF_FCC_RULE$])
+m4trace:configure.ac:573: -1- PINEVAR([default-standard-printer], [DF_STANDARD_PRINTER], [lpr], [Default standard printern])
+m4trace:configure.ac:573: -1- m4_pattern_allow([^DF_STANDARD_PRINTER$])
+m4trace:configure.ac:574: -1- PINEVAR([default-ansi-printer], [ANSI_PRINTER], [attached-to-ansi], [ANSI printer definition])
+m4trace:configure.ac:574: -1- m4_pattern_allow([^ANSI_PRINTER$])
+m4trace:configure.ac:575: -1- PINEVAR([default-addressbook], [DF_ADDRESSBOOK], [.addressbook], [Default addressbook name])
+m4trace:configure.ac:575: -1- m4_pattern_allow([^DF_ADDRESSBOOK$])
+m4trace:configure.ac:576: -1- PINEVAR([default-local-fullname], [DF_LOCAL_FULLNAME], ["Local Support"], [Default local support fullname])
+m4trace:configure.ac:576: -1- m4_pattern_allow([^DF_LOCAL_FULLNAME$])
+m4trace:configure.ac:577: -1- PINEVAR([default-local-address], [DF_LOCAL_ADDRESS], [postmaster], [Default local support address])
+m4trace:configure.ac:577: -1- m4_pattern_allow([^DF_LOCAL_ADDRESS$])
+m4trace:configure.ac:578: -1- PINEVAR([default-keyboard-lock-count], [DF_KBLOCK_PASSWD_COUNT], [1], [Default keyboard lock count])
+m4trace:configure.ac:578: -1- m4_pattern_allow([^DF_KBLOCK_PASSWD_COUNT$])
+m4trace:configure.ac:579: -1- PINEVAR([default-remote-addressbook-history], [DF_REMOTE_ABOOK_HISTORY], [3], [Default address book history count])
+m4trace:configure.ac:579: -1- m4_pattern_allow([^DF_REMOTE_ABOOK_HISTORY$])
+m4trace:configure.ac:580: -1- PINEVAR([smime-public-cert-directory], [DF_PUBLICCERT_DIR], [.alpine-smime/public], [Default Public Cert Directory])
+m4trace:configure.ac:580: -1- m4_pattern_allow([^DF_PUBLICCERT_DIR$])
+m4trace:configure.ac:581: -1- PINEVAR([smime-private-key-directory], [DF_PRIVATEKEY_DIR], [.alpine-smime/private], [Default Private Key Directory])
+m4trace:configure.ac:581: -1- m4_pattern_allow([^DF_PRIVATEKEY_DIR$])
+m4trace:configure.ac:582: -1- PINEVAR([smime-cacert-directory], [DF_CACERT_DIR], [.alpine-smime/ca], [Default Cert Authority Directory])
+m4trace:configure.ac:582: -1- m4_pattern_allow([^DF_CACERT_DIR$])
+m4trace:configure.ac:583: -1- PINEVAR_UNQUOTED([default-printer], [DF_DEFAULT_PRINTER], [ANSI_PRINTER], [Default printer])
+m4trace:configure.ac:583: -1- m4_pattern_allow([^DF_DEFAULT_PRINTER$])
+m4trace:configure.ac:623: -1- m4_pattern_allow([^PASSFILE$])
+m4trace:configure.ac:627: -1- m4_pattern_allow([^DF_SSHPATH$])
+m4trace:configure.ac:642: -1- m4_pattern_allow([^DF_SSHCMD$])
+m4trace:configure.ac:999: -1- m4_pattern_allow([^OSX_TARGET$])
+m4trace:configure.ac:1004: -1- m4_pattern_allow([^APPLEKEYCHAIN$])
+m4trace:configure.ac:1036: -1- m4_pattern_allow([^__EXTENSIONS__$])
+m4trace:configure.ac:1167: -1- m4_pattern_allow([^_WINDOWS$])
+m4trace:configure.ac:1242: -1- m4_pattern_allow([^HAS_TERMINFO$])
+m4trace:configure.ac:1245: -1- m4_pattern_allow([^HAS_TERMCAP$])
+m4trace:configure.ac:1269: -1- m4_pattern_allow([^ENABLE_LDAP$])
+m4trace:configure.ac:1274: -1- m4_pattern_allow([^LDAP_DEPRECATED$])
+m4trace:configure.ac:1438: -1- _m4_warn([cross], [cannot check for file existence when cross compiling], [../../lib/autoconf/general.m4:2777: AC_CHECK_FILE is expanded from...
 ../../lib/m4sugar/m4sh.m4:639: AS_IF is expanded from...
 ../../lib/autoconf/headers.m4:129: _AC_CHECK_HEADER_MONGREL is expanded from...
 ../../lib/autoconf/headers.m4:67: AC_CHECK_HEADER is expanded from...
-configure.ac:1437: the top level])
-m4trace:configure.ac:1483: -1- m4_pattern_allow([^HAVE_REGEX_H$])
-m4trace:configure.ac:1492: -1- ACX_PTHREAD([
+configure.ac:1438: the top level])
+m4trace:configure.ac:1484: -1- m4_pattern_allow([^HAVE_REGEX_H$])
+m4trace:configure.ac:1493: -1- ACX_PTHREAD([
       AC_MSG_RESULT([yes])
       case "$target" in
 	  *openbsd*)
@@ -5491,111 +5492,111 @@ m4trace:configure.ac:1492: -1- ACX_PTHREAD([
     ], [
       AC_MSG_RESULT([no])
     ])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:125: AC_LANG_SAVE is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
+configure.ac:1493: the top level])
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_C' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/c.m4:72: AC_LANG_C is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^acx_pthread_config$])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1493: the top level])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^acx_pthread_config$])
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
+configure.ac:1493: the top level])
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/general.m4:2687: AC_TRY_LINK is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_LIBS$])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^PTHREAD_CC$])
-m4trace:configure.ac:1492: -2- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1492: -1- m4_pattern_allow([^HAVE_PTHREAD$])
-m4trace:configure.ac:1492: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
+configure.ac:1493: the top level])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CREATE_JOINABLE$])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_LIBS$])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CFLAGS$])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^PTHREAD_CC$])
+m4trace:configure.ac:1493: -2- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1493: -1- m4_pattern_allow([^HAVE_PTHREAD$])
+m4trace:configure.ac:1493: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
 You should run autoupdate.], [../../lib/autoconf/lang.m4:134: AC_LANG_RESTORE is expanded from...
 m4/acx_pthread.m4:49: ACX_PTHREAD is expanded from...
-configure.ac:1492: the top level])
-m4trace:configure.ac:1510: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
-m4trace:configure.ac:1520: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:1522: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
-m4trace:configure.ac:1523: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
-m4trace:configure.ac:1524: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
-m4trace:configure.ac:1525: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
-m4trace:configure.ac:1527: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
-m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_TERMIOS$])
-m4trace:configure.ac:1555: -2- m4_pattern_allow([^HAS_TERMIO$])
-m4trace:configure.ac:1555: -2- m4_pattern_allow([^HAS_SGTTY$])
-m4trace:configure.ac:1572: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
+configure.ac:1493: the top level])
+m4trace:configure.ac:1511: -1- m4_pattern_allow([^HAVE_NANOSLEEP$])
+m4trace:configure.ac:1521: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:1523: -1- m4_pattern_allow([^STAT_MACROS_BROKEN$])
+m4trace:configure.ac:1524: -1- m4_pattern_allow([^HAVE_SYS_WAIT_H$])
+m4trace:configure.ac:1525: -1- m4_pattern_allow([^TIME_WITH_SYS_TIME$])
+m4trace:configure.ac:1526: -1- m4_pattern_allow([^GWINSZ_IN_SYS_IOCTL$])
+m4trace:configure.ac:1528: -1- m4_pattern_allow([^HAVE_UNISTD_H$])
+m4trace:configure.ac:1557: -2- m4_pattern_allow([^HAS_TERMIOS$])
+m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_TERMIO$])
+m4trace:configure.ac:1556: -2- m4_pattern_allow([^HAS_SGTTY$])
+m4trace:configure.ac:1573: -1- _m4_warn([obsolete], [your code may safely assume C89 semantics that RETSIGTYPE is void.
 Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.], [])
-m4trace:configure.ac:1581: -1- m4_pattern_allow([^RETSIGTYPE$])
-m4trace:configure.ac:1584: -1- m4_pattern_allow([^size_t$])
-m4trace:configure.ac:1585: -1- m4_pattern_allow([^mode_t$])
-m4trace:configure.ac:1586: -1- m4_pattern_allow([^pid_t$])
-m4trace:configure.ac:1587: -1- m4_pattern_allow([^uid_t$])
-m4trace:configure.ac:1587: -1- m4_pattern_allow([^gid_t$])
-m4trace:configure.ac:1588: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
-m4trace:configure.ac:1590: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
-m4trace:configure.ac:1592: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1609: -1- m4_pattern_allow([^UINT16$])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^HAVE_STDINT_H$])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
-m4trace:configure.ac:1611: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
-m4trace:configure.ac:1628: -1- m4_pattern_allow([^UINT32$])
-m4trace:configure.ac:1646: -1- m4_pattern_allow([^qsort_t$])
-m4trace:configure.ac:1650: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
-m4trace:configure.ac:1650: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
-m4trace:configure.ac:1650: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
-m4trace:configure.ac:1652: -1- m4_pattern_allow([^HAVE_STRCOLL$])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^HAVE_VFORK_H$])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^vfork$])
-m4trace:configure.ac:1656: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
-m4trace:configure.ac:1703: -1- m4_pattern_allow([^POSIX_SIGNALS$])
-m4trace:configure.ac:1703: -1- m4_pattern_allow([^SYSV_SIGNALS$])
-m4trace:configure.ac:1714: -1- m4_pattern_allow([^HAVE_SYSLOG$])
-m4trace:configure.ac:1736: -1- m4_pattern_allow([^SYSTYPE$])
-m4trace:configure.ac:1737: -1- m4_pattern_allow([^C_FILESEP$])
-m4trace:configure.ac:1738: -1- m4_pattern_allow([^S_FILESEP$])
-m4trace:configure.ac:1739: -1- m4_pattern_allow([^MAILDIR$])
-m4trace:configure.ac:1740: -1- m4_pattern_allow([^MODE_READONLY$])
-m4trace:configure.ac:1743: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
-m4trace:configure.ac:1744: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
-m4trace:configure.ac:1761: -1- m4_pattern_allow([^SMIME$])
-m4trace:configure.ac:1762: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
-m4trace:configure.ac:1814: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
-m4trace:configure.ac:1825: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
-m4trace:configure.ac:1829: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
-m4trace:configure.ac:1832: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
-m4trace:configure.ac:1852: -1- m4_pattern_allow([^PUBCOOKIE$])
-m4trace:configure.ac:1859: -1- m4_pattern_allow([^REGEX_BUILD$])
-m4trace:configure.ac:1861: -1- m4_pattern_allow([^WEB_BUILD$])
-m4trace:configure.ac:1862: -1- m4_pattern_allow([^WEB_BINDIR$])
-m4trace:configure.ac:1863: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
-m4trace:configure.ac:1864: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
-m4trace:configure.ac:1865: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
-m4trace:configure.ac:1867: -1- m4_pattern_allow([^AM_CFLAGS$])
-m4trace:configure.ac:1868: -1- m4_pattern_allow([^AM_LDFLAGS$])
-m4trace:configure.ac:1877: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.ac:1877: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.ac:1877: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
-m4trace:configure.ac:1877: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
-m4trace:configure.ac:1877: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
-m4trace:configure.ac:1877: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
-m4trace:configure.ac:1877: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
-m4trace:configure.ac:1877: -2- m4_include([VERSION])
-m4trace:configure.ac:1877: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1877: -2- m4_include([VERSION])
-m4trace:configure.ac:1877: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
-m4trace:configure.ac:1877: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
-m4trace:configure.ac:1877: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:1877: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:1582: -1- m4_pattern_allow([^RETSIGTYPE$])
+m4trace:configure.ac:1585: -1- m4_pattern_allow([^size_t$])
+m4trace:configure.ac:1586: -1- m4_pattern_allow([^mode_t$])
+m4trace:configure.ac:1587: -1- m4_pattern_allow([^pid_t$])
+m4trace:configure.ac:1588: -1- m4_pattern_allow([^uid_t$])
+m4trace:configure.ac:1588: -1- m4_pattern_allow([^gid_t$])
+m4trace:configure.ac:1589: -1- m4_pattern_allow([^TM_IN_SYS_TIME$])
+m4trace:configure.ac:1591: -1- m4_pattern_allow([^HAVE_UNION_WAIT$])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_SHORT$])
+m4trace:configure.ac:1593: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1610: -1- m4_pattern_allow([^UINT16$])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_STDINT_H$])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_INTTYPES_H$])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^HAVE_SYS_TYPES_H$])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_INT$])
+m4trace:configure.ac:1612: -1- m4_pattern_allow([^SIZEOF_UNSIGNED_LONG$])
+m4trace:configure.ac:1629: -1- m4_pattern_allow([^UINT32$])
+m4trace:configure.ac:1647: -1- m4_pattern_allow([^qsort_t$])
+m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG1$])
+m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG234$])
+m4trace:configure.ac:1651: -1- m4_pattern_allow([^SELECT_TYPE_ARG5$])
+m4trace:configure.ac:1653: -1- m4_pattern_allow([^HAVE_STRCOLL$])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_VFORK_H$])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_WORKING_VFORK$])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^vfork$])
+m4trace:configure.ac:1657: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
+m4trace:configure.ac:1704: -1- m4_pattern_allow([^POSIX_SIGNALS$])
+m4trace:configure.ac:1704: -1- m4_pattern_allow([^SYSV_SIGNALS$])
+m4trace:configure.ac:1715: -1- m4_pattern_allow([^HAVE_SYSLOG$])
+m4trace:configure.ac:1737: -1- m4_pattern_allow([^SYSTYPE$])
+m4trace:configure.ac:1738: -1- m4_pattern_allow([^C_FILESEP$])
+m4trace:configure.ac:1739: -1- m4_pattern_allow([^S_FILESEP$])
+m4trace:configure.ac:1740: -1- m4_pattern_allow([^MAILDIR$])
+m4trace:configure.ac:1741: -1- m4_pattern_allow([^MODE_READONLY$])
+m4trace:configure.ac:1744: -1- m4_pattern_allow([^C_CLIENT_TARGET$])
+m4trace:configure.ac:1745: -1- m4_pattern_allow([^C_CLIENT_WITH_IPV6$])
+m4trace:configure.ac:1762: -1- m4_pattern_allow([^SMIME$])
+m4trace:configure.ac:1763: -1- m4_pattern_allow([^SMIME_SSLCERTS$])
+m4trace:configure.ac:1815: -1- m4_pattern_allow([^C_CLIENT_CFLAGS$])
+m4trace:configure.ac:1826: -1- m4_pattern_allow([^C_CLIENT_LDFLAGS$])
+m4trace:configure.ac:1830: -1- m4_pattern_allow([^C_CLIENT_GCCOPTLEVEL$])
+m4trace:configure.ac:1833: -1- m4_pattern_allow([^C_CLIENT_SPECIALS$])
+m4trace:configure.ac:1853: -1- m4_pattern_allow([^PUBCOOKIE$])
+m4trace:configure.ac:1860: -1- m4_pattern_allow([^REGEX_BUILD$])
+m4trace:configure.ac:1862: -1- m4_pattern_allow([^WEB_BUILD$])
+m4trace:configure.ac:1863: -1- m4_pattern_allow([^WEB_BINDIR$])
+m4trace:configure.ac:1864: -1- m4_pattern_allow([^WEB_PUBCOOKIE_BUILD$])
+m4trace:configure.ac:1865: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LIB$])
+m4trace:configure.ac:1866: -1- m4_pattern_allow([^WEB_PUBCOOKIE_LINK$])
+m4trace:configure.ac:1868: -1- m4_pattern_allow([^AM_CFLAGS$])
+m4trace:configure.ac:1869: -1- m4_pattern_allow([^AM_LDFLAGS$])
+m4trace:configure.ac:1878: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.ac:1878: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.ac:1878: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
+m4trace:configure.ac:1878: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
+m4trace:configure.ac:1878: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
+m4trace:configure.ac:1878: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
+m4trace:configure.ac:1878: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
+m4trace:configure.ac:1878: -2- m4_include([VERSION])
+m4trace:configure.ac:1878: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1878: -2- m4_include([VERSION])
+m4trace:configure.ac:1878: -2- _m4_warn([syntax], [file `VERSION' Included several times], [])
+m4trace:configure.ac:1878: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"])
+m4trace:configure.ac:1878: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:1878: -1- _LT_PROG_LTMAIN
diff --git a/configure b/configure
index f1257f4b..d4dfbe1f 100755
--- a/configure
+++ b/configure
@@ -821,6 +821,7 @@ MAKE
 LN
 CP
 RM
+LIBTOOL_DEPS
 CPP
 OTOOL64
 OTOOL
@@ -5581,13 +5582,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5584: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5585: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5587: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:5588: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5590: output\"" >&5)
+  (eval echo "\"\$as_me:5591: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -6782,7 +6783,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6785 "configure"' > conftest.$ac_ext
+  echo '#line 6786 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8311,11 +8312,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8314: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8315: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8318: \$? = $ac_status" >&5
+   echo "$as_me:8319: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8650,11 +8651,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8653: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8654: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8657: \$? = $ac_status" >&5
+   echo "$as_me:8658: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8755,11 +8756,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8758: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8759: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8762: \$? = $ac_status" >&5
+   echo "$as_me:8763: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8810,11 +8811,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8813: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8814: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8817: \$? = $ac_status" >&5
+   echo "$as_me:8818: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11178,7 +11179,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11181 "configure"
+#line 11182 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11274,7 +11275,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11277 "configure"
+#line 11278 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11502,6 +11503,7 @@ CC="$lt_save_CC"
 
 
 
+
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
diff --git a/configure.ac b/configure.ac
index 10701fd7..af4f1eef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ AC_PROG_LN_S
 AC_PROG_AWK
 AC_PROG_RANLIB
 LT_INIT
+AC_SUBST([LIBTOOL_DEPS])
 
 AC_PATH_PROG(AR, ar, ar)
 AC_PATH_PROG(RM, rm, rm)
diff --git a/doc/alpine.1 b/doc/alpine.1
index ac6c8bed..a483fc77 100644
--- a/doc/alpine.1
+++ b/doc/alpine.1
@@ -335,12 +335,7 @@ Alpine-info, at https://www.washington.edu/alpine/alpine-info/
 .br
 Main Alpine distribution site:  
 .br
-http://patches.freeiz.com/alpine/
-
-.br
-Source code distribution: 
-.br
-http://patches.freeiz.com/alpine/release/alpine.tar.gz
+http://patches.freeiz.com/alpine/release/
 
 .br
 Alpine Technical Notes, included in the source distribution.
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 18379b93..374f9e7c 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -110,6 +110,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/pico/Makefile.in b/pico/Makefile.in
index 6f83b92f..82ff2d64 100644
--- a/pico/Makefile.in
+++ b/pico/Makefile.in
@@ -197,6 +197,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/pico/basic.c b/pico/basic.c
index 49b04bd6..189d396e 100644
--- a/pico/basic.c
+++ b/pico/basic.c
@@ -304,16 +304,14 @@ gotobop(int f, int n)
 	 * PLUS: if there's a quote string, a quoted-to-non-quoted
 	 *	 line transition.
 	 */
-	quoted = glo_quote_str ? quote_match(glo_quote_str, curwp->w_dotp, qstr, NLINE) : 0;
+	quoted = quote_match(glo_quote_str, curwp->w_dotp, qstr, NLINE);
 	qlen   = quoted ? ucs4_strlen(qstr) : 0;
 	while(lback(curwp->w_dotp) != curbp->b_linep
 	      && llength(lback(curwp->w_dotp)) > qlen
-	      && (glo_quote_str
-		  ? (quoted == quote_match(glo_quote_str,
+	      && quoted == quote_match(glo_quote_str,
 					   lback(curwp->w_dotp),
 					   qstr2, NLINE)
-		     && !ucs4_strcmp(qstr, qstr2))
-		  : 1)
+	      && !ucs4_strcmp(qstr, qstr2)
 	      && lgetc(curwp->w_dotp, qlen).c != TAB
 	      && lgetc(curwp->w_dotp, qlen).c != ' ')
 	  curwp->w_dotp = lback(curwp->w_dotp);
@@ -373,19 +371,16 @@ gotoeop(int f, int n)
 	 * PLUS: if there's a quote string, a quoted-to-non-quoted
 	 *	 line transition.
 	 */
-	quoted = glo_quote_str
-	  ? quote_match(glo_quote_str,
-			curwp->w_dotp, qstr, NLINE) : 0;
+	quoted = quote_match(glo_quote_str,
+			curwp->w_dotp, qstr, NLINE);
 	qlen   = quoted ? ucs4_strlen(qstr) : 0;
 	
 	while(curwp->w_dotp != curbp->b_linep
 	      && llength(lforw(curwp->w_dotp)) > qlen
-	      && (glo_quote_str
-		  ? (quoted == quote_match(glo_quote_str,
+	      && (quoted == quote_match(glo_quote_str,
 					   lforw(curwp->w_dotp),
 					   qstr2, NLINE)
 		     && !ucs4_strcmp(qstr, qstr2))
-		  : 1)
 	      && lgetc(lforw(curwp->w_dotp), qlen).c != TAB
 	      && lgetc(lforw(curwp->w_dotp), qlen).c != ' ')
 	  curwp->w_dotp = lforw(curwp->w_dotp);
diff --git a/pico/osdep/Makefile.in b/pico/osdep/Makefile.in
index 1a9dae1a..d9e6cedf 100644
--- a/pico/osdep/Makefile.in
+++ b/pico/osdep/Makefile.in
@@ -148,6 +148,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/pico/word.c b/pico/word.c
index 1f176ab3..b0008df1 100644
--- a/pico/word.c
+++ b/pico/word.c
@@ -815,11 +815,10 @@ fillpara(int f, int n)
 	swap_mark_and_dot_if_mark_comes_first();
 
 	/* determine if we're justifying quoted text or not */
-	qstr = (glo_quote_str
-		&& quote_match(glo_quote_str, 
-			       curwp->w_doto > 0 ? curwp->w_dotp->l_fp : curwp->w_dotp,
-			       qstr2, NSTRING)
-		&& *qstr2) ? qstr2 : NULL;
+	qstr = quote_match(glo_quote_str, 
+			curwp->w_doto > 0 ? curwp->w_dotp->l_fp : curwp->w_dotp,
+			qstr2, NSTRING)
+		&& *qstr2 ? qstr2 : NULL;
 
 
 	/*
@@ -843,10 +842,9 @@ fillpara(int f, int n)
 	  return(FALSE);
 
 	/* determine if we're justifying quoted text or not */
-	qstr = (glo_quote_str
-		&& quote_match(glo_quote_str, 
+	qstr = quote_match(glo_quote_str, 
 			       curwp->w_dotp, qstr2, NSTRING)
-		&& *qstr2) ? qstr2 : NULL;
+		&& *qstr2 ? qstr2 : NULL;
 
 	setmark(0,0);			/* mark last line of para */
 
diff --git a/pith/Makefile.in b/pith/Makefile.in
index c2978fc9..6b43661e 100644
--- a/pith/Makefile.in
+++ b/pith/Makefile.in
@@ -211,6 +211,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/pith/charconv/Makefile.in b/pith/charconv/Makefile.in
index 2b02eabc..c046c569 100644
--- a/pith/charconv/Makefile.in
+++ b/pith/charconv/Makefile.in
@@ -143,6 +143,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/pith/osdep/Makefile.in b/pith/osdep/Makefile.in
index b88a5a8b..01bb2045 100644
--- a/pith/osdep/Makefile.in
+++ b/pith/osdep/Makefile.in
@@ -150,6 +150,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/pith/pine.hlp b/pith/pine.hlp
index ab059824..1017d965 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
 reasonable place to be called from.
 Dummy change to get revision in pine.hlp
 ============= h_revision =================
-Alpine Commit 25 2013-08-19 19:58:19
+Alpine Commit 26 2013-08-28 22:31:51
 ============= h_news =================
 <HTML>
 <HEAD>
@@ -179,9 +179,13 @@ Additions include:
 <P>
 
 <UL>
-  <LI> Opening a folder updates recent count in maildrops.
+  <LI> Opening a folder updates recent count in maildrops (this already works
+       for other types of folders)
   <LI> Automatically redraw screen after opening an attachment instead of
        simply clearing it.
+  <LI> Pico: Justification works without need of a predefined quote string. 
+       This allows justification of blocks of text that are indented with 
+       spaces.
 </UL>
 
 <P>
@@ -4569,17 +4573,17 @@ F3&nbsp;&nbsp;Select&nbsp;Current&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;F4&nbsp;&nbsp;<A
 F6&nbsp;&nbsp;<A HREF="h_common_role">Compose using a role</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;F10&nbsp;<A HREF="h_index_collapse_expand">Collapse/Expand</A>&nbsp;Thread<BR>
 <BR>
 <!--chtml else-->
-Navigating&nbsp;the&nbsp;List&nbsp;of&nbsp;Messages&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Operations&nbsp;on&nbsp;the&nbsp;Current&nbsp;Message<BR>
--------------------------------&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;---------------------------------<BR>
-&nbsp;P&nbsp;&nbsp;&nbsp;Move&nbsp;to&nbsp;the&nbsp;previous&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&gt;&nbsp;&nbsp;View&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%&nbsp;&nbsp;<A HREF="h_common_print">Print</A><BR>
-&nbsp;N&nbsp;&nbsp;&nbsp;Move&nbsp;to&nbsp;the&nbsp;next&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;R&nbsp;&nbsp;<A HREF="h_common_reply">Reply</A>&nbsp;to&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;F&nbsp;&nbsp;<A HREF="h_common_reply">Forward</A><BR>
-&nbsp;-&nbsp;&nbsp;&nbsp;Show&nbsp;previous&nbsp;screen&nbsp;of&nbsp;messages&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;D&nbsp;&nbsp;<A HREF="h_common_delete">Mark&nbsp;for&nbsp;deletion</A><BR>
-Spc&nbsp;&nbsp;(space&nbsp;bar)&nbsp;Show&nbsp;next&nbsp;screen&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;U&nbsp;&nbsp;<A HREF="h_common_delete">Undelete</A>&nbsp;(remove&nbsp;deletion&nbsp;mark)<BR>
-&nbsp;J&nbsp;&nbsp;&nbsp;<A HREF="h_common_jump">Jump</A>&nbsp;to&nbsp;a&nbsp;specific&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;T&nbsp;&nbsp;<A HREF="h_common_take">Take&nbsp;Address</A>&nbsp;into&nbsp;Address&nbsp;Book<BR>
-&nbsp;W&nbsp;&nbsp;&nbsp;<A HREF="h_index_cmd_whereis">Whereis</A>&nbsp;--&nbsp;search&nbsp;for&nbsp;a&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;S&nbsp;&nbsp;<A HREF="h_common_save">Save</A>&nbsp;into&nbsp;an&nbsp;email&nbsp;folder<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;specific&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;E&nbsp;&nbsp;<A HREF="h_common_save">Export</A>&nbsp;as&nbsp;a&nbsp;plain&nbsp;text&nbsp;file<BR>
-Tab&nbsp;&nbsp;<A HREF="h_common_nextnew">Next&nbsp;new</A>&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B&nbsp;&nbsp;<A HREF="h_common_bounce">Bounce</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*&nbsp;&nbsp;<A HREF="h_common_flag">Flag</A><BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;<A HREF="h_common_pipe">Pipe</A>&nbsp;to&nbsp;a&nbsp;Unix&nbsp;Command<BR>
+Navigating&nbsp;the&nbsp;List&nbsp;of&nbsp;Messages&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Operations&nbsp;on&nbsp;the&nbsp;Current&nbsp;Message<BR>
+-------------------------------&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;---------------------------------<BR>
+&nbsp;P&nbsp;&nbsp;&nbsp;Move&nbsp;to&nbsp;the&nbsp;previous&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&gt;&nbsp;&nbsp;View&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;%&nbsp;&nbsp;<A HREF="h_common_print">Print</A><BR>
+&nbsp;N&nbsp;&nbsp;&nbsp;Move&nbsp;to&nbsp;the&nbsp;next&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;R&nbsp;&nbsp;<A HREF="h_common_reply">Reply</A>&nbsp;to&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;F&nbsp;&nbsp;<A HREF="h_common_reply">Forward</A><BR>
+&nbsp;-&nbsp;&nbsp;&nbsp;Show&nbsp;previous&nbsp;screen&nbsp;of&nbsp;messages&nbsp;&nbsp;&nbsp;&nbsp;D&nbsp;&nbsp;<A HREF="h_common_delete">Mark&nbsp;for&nbsp;deletion</A><BR>
+Spc&nbsp;&nbsp;(space&nbsp;bar)&nbsp;Show&nbsp;next&nbsp;screen&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;U&nbsp;&nbsp;<A HREF="h_common_delete">Undelete</A>&nbsp;(remove&nbsp;deletion&nbsp;mark)<BR>
+&nbsp;J&nbsp;&nbsp;&nbsp;<A HREF="h_common_jump">Jump</A>&nbsp;to&nbsp;a&nbsp;specific&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;T&nbsp;&nbsp;<A HREF="h_common_take">Take&nbsp;Address</A>&nbsp;into&nbsp;Address&nbsp;Book<BR>
+&nbsp;W&nbsp;&nbsp;&nbsp;<A HREF="h_index_cmd_whereis">Whereis</A>&nbsp;--&nbsp;search&nbsp;for&nbsp;a&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;S&nbsp;&nbsp;<A HREF="h_common_save">Save</A>&nbsp;into&nbsp;an&nbsp;email&nbsp;folder<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;specific&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;E&nbsp;&nbsp;<A HREF="h_common_save">Export</A>&nbsp;as&nbsp;a&nbsp;plain&nbsp;text&nbsp;file<BR>
+Tab&nbsp;&nbsp;<A HREF="h_common_nextnew">Next&nbsp;new</A>&nbsp;message&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B&nbsp;&nbsp;<A HREF="h_common_bounce">Bounce</A>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*&nbsp;&nbsp;<A HREF="h_common_flag">Flag</A><BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;<A HREF="h_common_pipe">Pipe</A>&nbsp;to&nbsp;a&nbsp;Unix&nbsp;Command<BR>
 Miscellaneous&nbsp;Operations<BR>
 ------------------------<BR>
 &nbsp;G&nbsp;&nbsp;&nbsp;<A HREF="h_common_goto">Goto</A>&nbsp;a&nbsp;specified&nbsp;folder&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;General&nbsp;Alpine&nbsp;Commands<BR>
diff --git a/regex/Makefile.in b/regex/Makefile.in
index 1f94a107..0ee7efea 100644
--- a/regex/Makefile.in
+++ b/regex/Makefile.in
@@ -144,6 +144,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/web/src/Makefile.in b/web/src/Makefile.in
index fe434471..7196de06 100644
--- a/web/src/Makefile.in
+++ b/web/src/Makefile.in
@@ -121,6 +121,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/web/src/alpined.d/Makefile.in b/web/src/alpined.d/Makefile.in
index 4625101d..cf328f5b 100644
--- a/web/src/alpined.d/Makefile.in
+++ b/web/src/alpined.d/Makefile.in
@@ -192,6 +192,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@
diff --git a/web/src/pubcookie/Makefile.in b/web/src/pubcookie/Makefile.in
index 4cc2524b..1ffdff29 100644
--- a/web/src/pubcookie/Makefile.in
+++ b/web/src/pubcookie/Makefile.in
@@ -167,6 +167,7 @@ LIBINTL = @LIBINTL@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN = @LN@
 LN_S = @LN_S@