diff -pruN 15.0.267-1/common/core/desktop/VERSION.md 15.0.268-1/common/core/desktop/VERSION.md
--- 15.0.267-1/common/core/desktop/VERSION.md	2022-07-26 05:48:58.000000000 +0000
+++ 15.0.268-1/common/core/desktop/VERSION.md	2022-08-04 18:31:40.000000000 +0000
@@ -1 +1 @@
-15.0.267
\ No newline at end of file
+15.0.268
\ No newline at end of file
diff -pruN 15.0.267-1/debian/changelog 15.0.268-1/debian/changelog
--- 15.0.267-1/debian/changelog	2022-07-26 08:38:41.000000000 +0000
+++ 15.0.268-1/debian/changelog	2022-08-05 15:31:36.000000000 +0000
@@ -1,3 +1,10 @@
+keyman (15.0.268-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Re-release to Debian
+
+ -- Eberhard Beilharz <eb1@sil.org>  Fri, 05 Aug 2022 17:31:36 +0200
+
 keyman (15.0.267-1) unstable; urgency=medium
 
   * New upstream release.
diff -pruN 15.0.267-1/HISTORY.md 15.0.268-1/HISTORY.md
--- 15.0.267-1/HISTORY.md	2022-07-26 05:47:37.000000000 +0000
+++ 15.0.268-1/HISTORY.md	2022-08-04 18:30:21.000000000 +0000
@@ -1,5 +1,24 @@
 # Keyman Version History
 
+## 15.0.267 stable 2022-07-26
+
+* fix(developer): QR Code for Package Editor had wrong path (#6927)
+* fix(ios): ignore CFBundleShortVersionString (#6935)
+* fix(web): context-only rule effects, set(&layer) from physical keystrokes  ️ (#6949)
+* chore(web): remove invalid warning msg (#6951)
+* fix(common): Fix `delete` :cherries: (#6966)
+* fix(linux): Another attempt at fixing postinst script :cherries: (#6961)
+* fix(linux): Fix uninstallation when using fcitx5 :cherries: (#6964)
+* fix(linux): Catch PermissionError exception :cherries: (#6969)
+* chore(linux): Update Debian changelog (#6972)
+* fix(developer): kmdecomp virtual character key output (#6945)
+* fix(developer): crash on exit when checking for updates (#6946)
+* fix(developer): crash when switching back a tab (#6947)
+* fix(developer): reduce timeouts if server shut down (#6948)
+* fix(android): rework longpress movement trigger (#6992)
+* chore(linux): Update changelog (#6987)
+* fix(developer): improve error message for multi-part key ids on <15.0 (#6990)
+
 ## 15.0.266 stable 2022-07-08
 
 * fix(linux): Fix post-install script :cherries: (#6895)
diff -pruN 15.0.267-1/lerna.json 15.0.268-1/lerna.json
--- 15.0.267-1/lerna.json	2022-07-26 05:47:38.000000000 +0000
+++ 15.0.268-1/lerna.json	2022-08-04 18:30:22.000000000 +0000
@@ -21,5 +21,5 @@
     "ts-node",
     "typescript"
   ],
-  "version": "15.0.267"
+  "version": "15.0.268"
 }
diff -pruN 15.0.267-1/linux/ibus-keyman/autom4te.cache/output.0 15.0.268-1/linux/ibus-keyman/autom4te.cache/output.0
--- 15.0.267-1/linux/ibus-keyman/autom4te.cache/output.0	2022-07-26 05:48:54.000000000 +0000
+++ 15.0.268-1/linux/ibus-keyman/autom4te.cache/output.0	2022-08-04 18:31:35.000000000 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for ibus-keyman 15.0.267.
+@%:@ Generated by GNU Autoconf 2.69 for ibus-keyman 15.0.268.
 @%:@
 @%:@ Report bugs to <https://github.com/keymanapp/keyman/issues/new>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ibus-keyman'
 PACKAGE_TARNAME='ibus-keyman'
-PACKAGE_VERSION='15.0.267'
-PACKAGE_STRING='ibus-keyman 15.0.267'
+PACKAGE_VERSION='15.0.268'
+PACKAGE_STRING='ibus-keyman 15.0.268'
 PACKAGE_BUGREPORT='https://github.com/keymanapp/keyman/issues/new'
 PACKAGE_URL=''
 
@@ -1388,7 +1388,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 ibus-keyman 15.0.267 to adapt to many kinds of systems.
+\`configure' configures ibus-keyman 15.0.268 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1459,7 +1459,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ibus-keyman 15.0.267:";;
+     short | recursive ) echo "Configuration of ibus-keyman 15.0.268:";;
    esac
   cat <<\_ACEOF
 
@@ -1601,7 +1601,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ibus-keyman configure 15.0.267
+ibus-keyman configure 15.0.268
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2091,7 +2091,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 ibus-keyman $as_me 15.0.267, which was
+It was created by ibus-keyman $as_me 15.0.268, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2956,7 +2956,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ibus-keyman'
- VERSION='15.0.267'
+ VERSION='15.0.268'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20307,7 +20307,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ibus-keyman $as_me 15.0.267, which was
+This file was extended by ibus-keyman $as_me 15.0.268, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20373,7 +20373,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="\\
-ibus-keyman config.status 15.0.267
+ibus-keyman config.status 15.0.268
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -pruN 15.0.267-1/linux/ibus-keyman/autom4te.cache/output.1 15.0.268-1/linux/ibus-keyman/autom4te.cache/output.1
--- 15.0.267-1/linux/ibus-keyman/autom4te.cache/output.1	2022-07-26 05:48:58.000000000 +0000
+++ 15.0.268-1/linux/ibus-keyman/autom4te.cache/output.1	2022-08-04 18:31:40.000000000 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for ibus-keyman 15.0.267.
+@%:@ Generated by GNU Autoconf 2.69 for ibus-keyman 15.0.268.
 @%:@
 @%:@ Report bugs to <https://github.com/keymanapp/keyman/issues/new>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ibus-keyman'
 PACKAGE_TARNAME='ibus-keyman'
-PACKAGE_VERSION='15.0.267'
-PACKAGE_STRING='ibus-keyman 15.0.267'
+PACKAGE_VERSION='15.0.268'
+PACKAGE_STRING='ibus-keyman 15.0.268'
 PACKAGE_BUGREPORT='https://github.com/keymanapp/keyman/issues/new'
 PACKAGE_URL=''
 
@@ -1388,7 +1388,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 ibus-keyman 15.0.267 to adapt to many kinds of systems.
+\`configure' configures ibus-keyman 15.0.268 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1459,7 +1459,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ibus-keyman 15.0.267:";;
+     short | recursive ) echo "Configuration of ibus-keyman 15.0.268:";;
    esac
   cat <<\_ACEOF
 
@@ -1601,7 +1601,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ibus-keyman configure 15.0.267
+ibus-keyman configure 15.0.268
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2091,7 +2091,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 ibus-keyman $as_me 15.0.267, which was
+It was created by ibus-keyman $as_me 15.0.268, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2956,7 +2956,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ibus-keyman'
- VERSION='15.0.267'
+ VERSION='15.0.268'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20307,7 +20307,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ibus-keyman $as_me 15.0.267, which was
+This file was extended by ibus-keyman $as_me 15.0.268, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20373,7 +20373,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="\\
-ibus-keyman config.status 15.0.267
+ibus-keyman config.status 15.0.268
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -pruN 15.0.267-1/linux/ibus-keyman/autom4te.cache/output.2 15.0.268-1/linux/ibus-keyman/autom4te.cache/output.2
--- 15.0.267-1/linux/ibus-keyman/autom4te.cache/output.2	2022-07-26 05:48:56.000000000 +0000
+++ 15.0.268-1/linux/ibus-keyman/autom4te.cache/output.2	2022-08-04 18:31:38.000000000 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for ibus-keyman 15.0.267.
+@%:@ Generated by GNU Autoconf 2.69 for ibus-keyman 15.0.268.
 @%:@
 @%:@ Report bugs to <https://github.com/keymanapp/keyman/issues/new>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ibus-keyman'
 PACKAGE_TARNAME='ibus-keyman'
-PACKAGE_VERSION='15.0.267'
-PACKAGE_STRING='ibus-keyman 15.0.267'
+PACKAGE_VERSION='15.0.268'
+PACKAGE_STRING='ibus-keyman 15.0.268'
 PACKAGE_BUGREPORT='https://github.com/keymanapp/keyman/issues/new'
 PACKAGE_URL=''
 
@@ -1388,7 +1388,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 ibus-keyman 15.0.267 to adapt to many kinds of systems.
+\`configure' configures ibus-keyman 15.0.268 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1459,7 +1459,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ibus-keyman 15.0.267:";;
+     short | recursive ) echo "Configuration of ibus-keyman 15.0.268:";;
    esac
   cat <<\_ACEOF
 
@@ -1601,7 +1601,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ibus-keyman configure 15.0.267
+ibus-keyman configure 15.0.268
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2091,7 +2091,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 ibus-keyman $as_me 15.0.267, which was
+It was created by ibus-keyman $as_me 15.0.268, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2956,7 +2956,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ibus-keyman'
- VERSION='15.0.267'
+ VERSION='15.0.268'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20307,7 +20307,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ibus-keyman $as_me 15.0.267, which was
+This file was extended by ibus-keyman $as_me 15.0.268, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20373,7 +20373,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="\\
-ibus-keyman config.status 15.0.267
+ibus-keyman config.status 15.0.268
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -pruN 15.0.267-1/linux/ibus-keyman/autom4te.cache/requests 15.0.268-1/linux/ibus-keyman/autom4te.cache/requests
--- 15.0.267-1/linux/ibus-keyman/autom4te.cache/requests	2022-07-26 05:48:58.000000000 +0000
+++ 15.0.268-1/linux/ibus-keyman/autom4te.cache/requests	2022-08-04 18:31:40.000000000 +0000
@@ -74,255 +74,255 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'gl_LOCK' => 1,
+                        'LT_PROG_RC' => 1,
+                        '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'gl_DISABLE_THREADS' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
                         'AM_SET_LEADING_DOT' => 1,
-                        'AC_TYPE_LONG_LONG_INT' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'AC_LIB_PROG_LD' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'gt_GLIBC2' => 1,
+                        'gt_TYPE_WCHAR_T' => 1,
+                        '_LT_PROG_F77' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'gt_INTL_SUBDIR_CORE' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        'gl_XSIZE' => 1,
+                        'gl_THREADLIB_EARLY' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
+                        'AM_PATH_PROG_WITH_TEST' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'gt_INTTYPES_PRI' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
+                        'gl_EXTERN_INLINE' => 1,
+                        'AM_PROG_LD' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LIB_APPENDTOVAR' => 1,
+                        'gl_PREREQ_LOCK' => 1,
                         'AC_LIB_LINKFLAGS_BODY' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_LIB_PREFIX' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
                         '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'PKG_CHECK_MODULES' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
                         'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AC_LIB_WITH_FINAL_PREFIX' => 1,
-                        'gt_GL_ATTRIBUTE' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        '_LTDL_SETUP' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIB_PROG_LD' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_' => 1,
+                        'LT_INIT' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'gl_AC_TYPE_UINTMAX_T' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'LT_OUTPUT' => 1,
+                        'gt_TYPE_INTMAX_T' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
                         'LT_SYS_MODULE_EXT' => 1,
-                        'AM_PATH_PROG_WITH_TEST' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'gl_PREREQ_LOCK' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'LT_PROG_GCJ' => 1,
+                        'gl_AC_HEADER_INTTYPES_H' => 1,
+                        'AM_XGETTEXT_OPTION_INIT' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_LIB_PREFIX' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIB_PREPARE_MULTILIB' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AC_LIB_FROMPACKAGE' => 1,
+                        'gt_TYPE_WINT_T' => 1,
                         'gt_INTL_MACOSX' => 1,
+                        'AC_LIB_PROG_LD_GNU' => 1,
+                        'gl_GLIBC21' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        'AC_LIB_WITH_FINAL_PREFIX' => 1,
+                        'AM_GNU_GETTEXT_NEED' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
                         'LTSUGAR_VERSION' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AC_COMPUTE_INT' => 1,
-                        'AM_ICONV' => 1,
-                        'gl_AC_TYPE_UINTMAX_T' => 1,
-                        'AM_GNU_GETTEXT_VERSION' => 1,
-                        'AC_PROG_NM' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'gt_LC_MESSAGES' => 1,
+                        'AM_PO_SUBDIRS' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'PKG_CHECK_MODULES' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'gt_GL_ATTRIBUTE' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
                         'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_PROG_LD' => 1,
-                        'LT_PATH_LD' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
                         '_LT_AC_FILE_LTDLL_C' => 1,
-                        'gl_THREADLIB_BODY' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'gt_TYPE_WINT_T' => 1,
+                        'LT_AC_PROG_RC' => 1,
                         '_LT_LINKER_BOILERPLATE' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AC_LIB_PREPARE_MULTILIB' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        'gl_XSIZE' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'LT_FUNC_ARGZ' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'gl_LOCK' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'AM_INTL_SUBDIR' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'gl_THREADLIB_EARLY_BODY' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'gt_GLIBC2' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AC_TYPE_LONG_LONG_INT' => 1,
+                        'gl_VISIBILITY' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'gl_THREADLIB' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'gl_FCNTL_O_FLAGS' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'm4_include' => 1,
                         '_LT_AC_LANG_GCJ' => 1,
-                        'LT_LIB_M' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'gl_DISABLE_THREADS' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AM_GNU_GETTEXT_NEED' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
                         '_LT_AC_LOCK' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AC_LIB_PREPARE_PREFIX' => 1,
-                        'LT_OUTPUT' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'gt_PRINTF_POSIX' => 1,
-                        'include' => 1,
-                        'PKG_CHECK_VAR' => 1,
+                        'm4_pattern_forbid' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'LT_LANG' => 1,
+                        'LT_LIB_M' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'AC_DISABLE_STATIC' => 1,
                         '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'LT_INIT' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_LIB_RPATH' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_DEFUN' => 1,
+                        'PKG_INSTALLDIR' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'PKG_CHECK_MODULES_STATIC' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'gl_THREADLIB_EARLY_BODY' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
                         '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_LIB_LINKFLAGS' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'm4_include' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
                         '_LT_AC_SHELL_INIT' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'AC_LIB_FROMPACKAGE' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'AU_DEFUN' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'LT_LANG' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AM_ICONV_LINKFLAGS_BODY' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'gt_INTTYPES_PRI' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AM_XGETTEXT_OPTION_INIT' => 1,
+                        'AC_LIB_ARG_WITH' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AC_LIB_RPATH' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
                         'LT_FUNC_DLSYM_USCORE' => 1,
-                        'PKG_CHECK_MODULES_STATIC' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'AM_RUN_LOG' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
+                        'gl_THREADLIB_BODY' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AC_LIB_PREPARE_PREFIX' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'AM_ICONV_LINK' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+                        '_m4_warn' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'LTDL_INIT' => 1,
                         '_AM_MANGLE_OPTION' => 1,
+                        'AM_NLS' => 1,
                         'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'gt_TYPE_WCHAR_T' => 1,
-                        'LT_PROG_RC' => 1,
-                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
-                        'LT_PROG_GO' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        'PKG_NOARCH_INSTALLDIR' => 1,
-                        'AM_POSTPROCESS_PO_MAKEFILE' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'gt_INTDIV0' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
                         'gl_AC_HEADER_STDINT_H' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'gt_TYPE_INTMAX_T' => 1,
-                        'gl_GLIBC21' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AM_ICONV_LINK' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'gl_FCNTL_O_FLAGS' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'AC_COMPUTE_INT' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'gt_INTDIV0' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_ICONV_LINKFLAGS_BODY' => 1,
                         'LT_CMD_MAX_LEN' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'PKG_INSTALLDIR' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'LT_FUNC_ARGZ' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AM_LANGINFO_CODESET' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AM_INTL_SUBDIR' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'gl_SIZE_MAX' => 1,
+                        'AU_DEFUN' => 1,
+                        'LT_LIB_DLLOAD' => 1,
                         'AC_ENABLE_STATIC' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
                         'AM_DEP_TRACK' => 1,
-                        '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
-                        'LTDL_INIT' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'AM_PO_SUBDIRS' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        'gt_LC_MESSAGES' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AM_NLS' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'gl_THREADLIB_EARLY' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'gl_SIZE_MAX' => 1,
-                        'AC_LIB_HAVE_LINKFLAGS' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AC_LIB_ARG_WITH' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'gl_EXTERN_INLINE' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'PKG_PROG_PKG_CONFIG' => 1,
-                        'gl_THREADLIB' => 1,
+                        'include' => 1,
+                        'AC_PROG_NM' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'AC_CHECK_LIBM' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AM_LANGINFO_CODESET' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'AM_ICONV' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
                         'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'gl_AC_HEADER_INTTYPES_H' => 1,
-                        'gl_VISIBILITY' => 1,
                         '_LT_PROG_FC' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'gt_INTL_SUBDIR_CORE' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
-                        '_m4_warn' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AC_DEFUN' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'AC_LIB_APPENDTOVAR' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'AC_LIB_PROG_LD_GNU' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AM_POSTPROCESS_PO_MAKEFILE' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'gt_PRINTF_POSIX' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -337,66 +337,66 @@
                         'configure.ac'
                       ],
                       {
-                        'm4_pattern_forbid' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_CANONICAL_HOST' => 1,
                         'AM_PROG_F77_C_O' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        '_m4_warn' => 1,
-                        'm4_include' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
+                        'sinclude' => 1,
                         'AM_PATH_GUILE' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'LT_INIT' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'include' => 1,
-                        'sinclude' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AM_GNU_GETTEXT' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AC_CONFIG_HEADERS' => 1,
-                        'AM_NLS' => 1,
                         'AM_POT_TOOLS' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_SUBST' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_NLS' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'm4_sinclude' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'm4_include' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         'AC_FC_FREEFORM' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_m4_warn' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AM_PROG_AR' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'LT_INIT' => 1,
                         'AM_PROG_MOC' => 1,
+                        'AH_OUTPUT' => 1,
                         'AM_PROG_CXX_C_O' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AC_INIT' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
                         'AC_CONFIG_LINKS' => 1,
-                        '_AM_COND_IF' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'AC_INIT' => 1,
                         'AC_CONFIG_AUX_DIR' => 1,
-                        'AM_PROG_AR' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AC_SUBST' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
                         '_AM_COND_ELSE' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AH_OUTPUT' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1
+                        'AM_SILENT_RULES' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -470,255 +470,255 @@
                         'configure.ac'
                       ],
                       {
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AM_GNU_GETTEXT_VERSION' => 1,
                         'AC_PROG_NM' => 1,
-                        'AC_COMPUTE_INT' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AM_ICONV' => 1,
-                        'gl_AC_TYPE_UINTMAX_T' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'gt_INTL_MACOSX' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'gl_PREREQ_LOCK' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
                         'LT_PROG_GCJ' => 1,
-                        'AM_PATH_PROG_WITH_TEST' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'gl_XSIZE' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AC_LIB_PREPARE_MULTILIB' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'gt_TYPE_WINT_T' => 1,
-                        'gl_THREADLIB_BODY' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AM_SILENT_RULES' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AC_LIB_PREFIX' => 1,
-                        'AC_LIB_PROG_LD' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_LIB_LINKFLAGS_BODY' => 1,
-                        'AC_TYPE_LONG_LONG_INT' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'gt_GL_ATTRIBUTE' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AC_LIB_WITH_FINAL_PREFIX' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'PKG_CHECK_MODULES' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'LT_PATH_NM' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_LIB_RPATH' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'LT_INIT' => 1,
-                        'include' => 1,
-                        'gt_PRINTF_POSIX' => 1,
-                        'PKG_CHECK_VAR' => 1,
-                        'LT_OUTPUT' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AC_LIB_PREPARE_PREFIX' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'AC_LIB_FROMPACKAGE' => 1,
-                        'AM_MISSING_PROG' => 1,
                         'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'AM_SILENT_RULES' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_LIBTOOL_F77' => 1,
                         'AC_CHECK_LIBM' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AC_LIB_LINKFLAGS' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'm4_include' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_POSTPROCESS_PO_MAKEFILE' => 1,
                         '_LT_CC_BASENAME' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'gt_GLIBC2' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'gl_THREADLIB_EARLY_BODY' => 1,
+                        'AM_ICONV' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+                        'gt_PRINTF_POSIX' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AM_NLS' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'gl_AC_HEADER_STDINT_H' => 1,
+                        'AC_COMPUTE_INT' => 1,
+                        'gt_INTDIV0' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'AM_ICONV_LINKFLAGS_BODY' => 1,
+                        'AM_LANGINFO_CODESET' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
                         'AM_INTL_SUBDIR' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'gl_LOCK' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_DEFUN_ONCE' => 1,
                         'LT_FUNC_ARGZ' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AM_GNU_GETTEXT_NEED' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'gl_DISABLE_THREADS' => 1,
                         '_AM_IF_OPTION' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'LT_LIB_M' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AM_ICONV_LINK' => 1,
-                        'gl_GLIBC21' => 1,
-                        'gt_TYPE_INTMAX_T' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'gl_AC_HEADER_STDINT_H' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'gl_FCNTL_O_FLAGS' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'gl_SIZE_MAX' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'include' => 1,
+                        'AU_DEFUN' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AC_LIB_ARG_WITH' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
                         'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
                         '_LT_WITH_SYSROOT' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'gt_INTTYPES_PRI' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'AM_ICONV_LINKFLAGS_BODY' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'LT_LANG' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AU_DEFUN' => 1,
-                        'PKG_NOARCH_INSTALLDIR' => 1,
-                        'AM_POSTPROCESS_PO_MAKEFILE' => 1,
-                        'gt_INTDIV0' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'LT_PROG_GO' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        'LT_PROG_RC' => 1,
-                        'gt_TYPE_WCHAR_T' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'PKG_CHECK_MODULES_STATIC' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AM_RUN_LOG' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'AM_XGETTEXT_OPTION_INIT' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AC_LIB_RPATH' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_LIB_PREPARE_PREFIX' => 1,
                         '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'gt_INTL_SUBDIR_CORE' => 1,
-                        'LTVERSION_VERSION' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'gl_THREADLIB_BODY' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'm4_pattern_allow' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'AM_ICONV_LINK' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
+                        '_m4_warn' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        '_LT_AC_TAGVAR' => 1,
                         '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'gl_VISIBILITY' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'gl_AC_HEADER_INTTYPES_H' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
+                        'LTDL_INIT' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'gl_FCNTL_O_FLAGS' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
                         'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AM_LANGINFO_CODESET' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AC_LIB_PROG_LD_GNU' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'm4_include' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'LT_LANG' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'LT_LIB_M' => 1,
+                        'PKG_CHECK_MODULES_STATIC' => 1,
+                        'PKG_INSTALLDIR' => 1,
                         'AC_DEFUN' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'gl_THREADLIB_EARLY_BODY' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
                         'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_DISABLE_SHARED' => 1,
                         'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'AC_LIB_APPENDTOVAR' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        '_m4_warn' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_TYPE_UNSIGNED_LONG_LONG_INT' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
                         'gt_LC_MESSAGES' => 1,
                         'AM_PO_SUBDIRS' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'LTDL_INIT' => 1,
-                        '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
-                        'AM_DEP_TRACK' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'gt_GL_ATTRIBUTE' => 1,
+                        'PKG_CHECK_MODULES' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AC_LIB_LINKFLAGS_FROM_LIBS' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'gl_VISIBILITY' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_TYPE_LONG_LONG_INT' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'gl_THREADLIB' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'gt_TYPE_INTMAX_T' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
                         'LTOPTIONS_VERSION' => 1,
-                        'PKG_INSTALLDIR' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AC_ENABLE_STATIC' => 1,
+                        'gl_AC_HEADER_INTTYPES_H' => 1,
+                        'AM_XGETTEXT_OPTION_INIT' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIB_PREPARE_MULTILIB' => 1,
+                        'AM_GNU_GETTEXT_VERSION' => 1,
+                        'AC_LIB_PREFIX' => 1,
+                        'gt_INTL_MACOSX' => 1,
+                        'AC_LIB_PROG_LD_GNU' => 1,
+                        'gt_TYPE_WINT_T' => 1,
+                        'AC_LIB_FROMPACKAGE' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'gl_GLIBC21' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AM_GNU_GETTEXT_NEED' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
                         'PKG_PROG_PKG_CONFIG' => 1,
-                        'gl_THREADLIB' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        'AC_LIB_WITH_FINAL_PREFIX' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'gt_INTTYPES_PRI' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        'AC_LIB_LINKFLAGS' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LIB_APPENDTOVAR' => 1,
+                        'gl_PREREQ_LOCK' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
                         'gl_EXTERN_INLINE' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'gl_SIZE_MAX' => 1,
-                        'AC_LIB_HAVE_LINKFLAGS' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AC_LIB_ARG_WITH' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_LIB_LINKFLAGS_BODY' => 1,
+                        'AC_LIB_PROG_LD' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'AM_PROG_NM' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'LT_INIT' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'gl_AC_TYPE_UINTMAX_T' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'LT_PROG_RC' => 1,
+                        'gl_LOCK' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        '_AC_TYPE_LONG_LONG_SNIPPET' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'gl_DISABLE_THREADS' => 1,
+                        'gt_GLIBC2' => 1,
+                        'gt_TYPE_WCHAR_T' => 1,
                         '_LT_PROG_F77' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'gt_INTL_SUBDIR_CORE' => 1,
+                        'AC_LIB_HAVE_LINKFLAGS' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'gl_XSIZE' => 1,
                         'gl_THREADLIB_EARLY' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AM_NLS' => 1,
-                        'AC_LTDL_PREOPEN' => 1
+                        'AC_WITH_LTDL' => 1,
+                        'AM_PATH_PROG_WITH_TEST' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_GNU_GETTEXT_REQUIRE_VERSION' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff -pruN 15.0.267-1/linux/ibus-keyman/autom4te.cache/traces.1 15.0.268-1/linux/ibus-keyman/autom4te.cache/traces.1
--- 15.0.267-1/linux/ibus-keyman/autom4te.cache/traces.1	2022-07-26 05:48:58.000000000 +0000
+++ 15.0.268-1/linux/ibus-keyman/autom4te.cache/traces.1	2022-08-04 18:31:40.000000000 +0000
@@ -12,7 +12,7 @@ m4trace:aclocal.m4:1475: -1- m4_include(
 m4trace:aclocal.m4:1476: -1- m4_include([m4/nls.m4])
 m4trace:aclocal.m4:1477: -1- m4_include([m4/po.m4])
 m4trace:aclocal.m4:1478: -1- m4_include([m4/progtest.m4])
-m4trace:configure.ac:32: -1- AC_INIT([ibus-keyman], [15.0.267], [https://github.com/keymanapp/keyman/issues/new])
+m4trace:configure.ac:32: -1- AC_INIT([ibus-keyman], [15.0.268], [https://github.com/keymanapp/keyman/issues/new])
 m4trace:configure.ac:32: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:32: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:32: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
diff -pruN 15.0.267-1/linux/ibus-keyman/configure 15.0.268-1/linux/ibus-keyman/configure
--- 15.0.267-1/linux/ibus-keyman/configure	2022-07-26 05:48:57.000000000 +0000
+++ 15.0.268-1/linux/ibus-keyman/configure	2022-08-04 18:31:39.000000000 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ibus-keyman 15.0.267.
+# Generated by GNU Autoconf 2.69 for ibus-keyman 15.0.268.
 #
 # Report bugs to <https://github.com/keymanapp/keyman/issues/new>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ibus-keyman'
 PACKAGE_TARNAME='ibus-keyman'
-PACKAGE_VERSION='15.0.267'
-PACKAGE_STRING='ibus-keyman 15.0.267'
+PACKAGE_VERSION='15.0.268'
+PACKAGE_STRING='ibus-keyman 15.0.268'
 PACKAGE_BUGREPORT='https://github.com/keymanapp/keyman/issues/new'
 PACKAGE_URL=''
 
@@ -1388,7 +1388,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 ibus-keyman 15.0.267 to adapt to many kinds of systems.
+\`configure' configures ibus-keyman 15.0.268 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1459,7 +1459,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ibus-keyman 15.0.267:";;
+     short | recursive ) echo "Configuration of ibus-keyman 15.0.268:";;
    esac
   cat <<\_ACEOF
 
@@ -1601,7 +1601,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ibus-keyman configure 15.0.267
+ibus-keyman configure 15.0.268
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2091,7 +2091,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 ibus-keyman $as_me 15.0.267, which was
+It was created by ibus-keyman $as_me 15.0.268, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2956,7 +2956,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ibus-keyman'
- VERSION='15.0.267'
+ VERSION='15.0.268'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -20307,7 +20307,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ibus-keyman $as_me 15.0.267, which was
+This file was extended by ibus-keyman $as_me 15.0.268, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20373,7 +20373,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="\\
-ibus-keyman config.status 15.0.267
+ibus-keyman config.status 15.0.268
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff -pruN 15.0.267-1/linux/keyman-config/keyman_config/version.py 15.0.268-1/linux/keyman-config/keyman_config/version.py
--- 15.0.267-1/linux/keyman-config/keyman_config/version.py	2022-07-26 05:48:59.000000000 +0000
+++ 15.0.268-1/linux/keyman-config/keyman_config/version.py	2022-08-04 18:31:41.000000000 +0000
@@ -4,8 +4,8 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module module
-__version__ = "15.0.267"
-__versionwithtag__ = "15.0.267"
+__version__ = "15.0.268"
+__versionwithtag__ = "15.0.268"
 __majorversion__ = "15"
 __releaseversion__ = "15.0"
 __tier__ = "stable"
diff -pruN 15.0.267-1/resources/build/build-utils.sh 15.0.268-1/resources/build/build-utils.sh
--- 15.0.267-1/resources/build/build-utils.sh	2022-07-26 05:47:38.000000000 +0000
+++ 15.0.268-1/resources/build/build-utils.sh	2022-08-04 18:30:22.000000000 +0000
@@ -27,6 +27,13 @@
 # Note: keep changes to version, tier and tag determination in sync with mkver (windows/src/buildutils/mkver)
 #
 
+# Setup variable for calling script's path and name
+if [ ! -z ${THIS_SCRIPT+x} ]; then
+  THIS_SCRIPT_PATH="$(dirname "$THIS_SCRIPT")"
+  readonly THIS_SCRIPT_PATH
+  THIS_SCRIPT_NAME="$(basename "$THIS_SCRIPT")"
+  readonly THIS_SCRIPT_NAME
+fi
 
 function die () {
     # TODO: consolidate this with fail() from shellHelperFunctions.sh
diff -pruN 15.0.267-1/resources/gosh/package.json 15.0.268-1/resources/gosh/package.json
--- 15.0.267-1/resources/gosh/package.json	2022-07-26 05:47:38.000000000 +0000
+++ 15.0.268-1/resources/gosh/package.json	2022-08-04 18:30:22.000000000 +0000
@@ -1,6 +1,6 @@
 {
   "name": "@keymanapp/resources-gosh",
-  "version": "15.0.267",
+  "version": "15.0.268",
   "description": "Good Ol' Shell",
   "author": "Marc Durdin <marc@keyman.com> (https://github.com/mcdurdin)",
   "contributors": [
diff -pruN 15.0.267-1/resources/gosh/package-lock.json 15.0.268-1/resources/gosh/package-lock.json
--- 15.0.267-1/resources/gosh/package-lock.json	2022-07-26 05:47:38.000000000 +0000
+++ 15.0.268-1/resources/gosh/package-lock.json	2022-08-04 18:30:22.000000000 +0000
@@ -1,5 +1,5 @@
 {
   "name": "@keymanapp/resources-gosh",
-  "version": "15.0.267",
+  "version": "15.0.268",
   "lockfileVersion": 1
 }
diff -pruN 15.0.267-1/resources/shellHelperFunctions.sh 15.0.268-1/resources/shellHelperFunctions.sh
--- 15.0.267-1/resources/shellHelperFunctions.sh	2022-07-26 05:47:38.000000000 +0000
+++ 15.0.268-1/resources/shellHelperFunctions.sh	2022-08-04 18:30:22.000000000 +0000
@@ -90,16 +90,27 @@ if [[ -n "$TERM" ]] && [[ "$TERM" != "du
     COLOR_BLUE=$(tput setaf 4)
     COLOR_YELLOW=$(tput setaf 3)
     COLOR_RESET=$(tput sgr0)
+    # e.g. VSCode https://code.visualstudio.com/updates/v1_69#_setmark-sequence-support
+    HEADING_SETMARK='\x1b]1337;SetMark\x07'
 else
     COLOR_RED=
     COLOR_GREEN=
     COLOR_BLUE=
     COLOR_YELLOW=
     COLOR_RESET=
+    HEADING_SETMARK=
 fi
 
 echo_heading() {
-  echo "${COLOR_BLUE}$*${COLOR_RESET}"
+  echo -e "${HEADING_SETMARK}${COLOR_BLUE}$*${COLOR_RESET}"
+}
+
+log_error() {
+  echo "${COLOR_RED}$THIS_SCRIPT_NAME: $*${COLOR_RESET}" >&2
+}
+
+log_warning() {
+  echo "${COLOR_YELLOW}$THIS_SCRIPT_NAME: $*${COLOR_RESET}" >&2
 }
 
 fail() {
@@ -355,4 +366,4 @@ verify_npm_setup () {
       cd "$WORKING_DIRECTORY"
     fi
   fi
-}
\ No newline at end of file
+}
diff -pruN 15.0.267-1/VERSION.md 15.0.268-1/VERSION.md
--- 15.0.267-1/VERSION.md	2022-07-26 05:47:37.000000000 +0000
+++ 15.0.268-1/VERSION.md	2022-08-04 18:30:21.000000000 +0000
@@ -1 +1 @@
-15.0.267
\ No newline at end of file
+15.0.268
\ No newline at end of file
