rbnacl-libsodium 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdf327f6c746404ea135f13c1d5e88fd0824172e
-  data.tar.gz: 75c1710bb4cbc181e3bfa10e47d15cd50296a01d
+  metadata.gz: cdcde333b2b28626603200b223e474ce2039aef5
+  data.tar.gz: 1b2febc1624cd7f8e81feabdeb0b7c10bc1647f3
 SHA512:
-  metadata.gz: a3e80ff2e70c7c041134268cb1cb4434374f31a6551832faae6ae41cee82d12d25af6b02a48deedb76abe2b51b01471983b066d0be4b31689c5e5239e448cc39
-  data.tar.gz: 3d5ae3ffd6de648b501fd4690cc019b66b2648ec3628f2f4d8acbe20d8e328dd02ee5285e6cb5da00a6229e27095d5b401ecc62325c6961ec4945583593ccde7
+  metadata.gz: 9e7039a422c1ec1d1b389c554f6a6f56c5f650717868c6fc7be1da0e969d26fc3793c8c9464e2bc7c48640279523382e02e6dbc38c9bbc4e274d2532a7cd1956
+  data.tar.gz: a337f4ff047d1aa001c27babd1bdd98eefbce5bd4143aa3071ec4f52a12be093e5b8af72ce2bbc62f38b5cde2f38250050130cc650220dd5d2138257d219748a

data/CHANGES.md

@@ -1,3 +1,11 @@
+1.0.6 (2015-11-01)
+------------------
+* Update to libsodium 1.0.6
+
+1.0.5 (2015-11-01)
+------------------
+* Update to libsodium 1.0.5
+
 1.0.4 (2015-10-18)
 ------------------
 * Update to libsodium 1.0.4

data/lib/rbnacl/libsodium/version.rb

@@ -1,5 +1,5 @@
 module RbNaCl
   module Libsodium
-    VERSION = '1.0.5'
+    VERSION = '1.0.6'
   end
 end

data/vendor/libsodium/ChangeLog

@@ -1,4 +1,29 @@
 
+* Version 1.0.6
+ - Optimized implementations of Blake2 have been added for modern
+Intel platforms. crypto_generichash() is now faster than MD5 and SHA1
+implementations while being far more secure.
+ - Functions for which the return value should be checked have been
+tagged with `__attribute__ ((warn_unused_result))`. This will
+intentionally break code compiled with `-Werror` that didn't bother
+checking critical return values.
+ - The `crypto_sign_edwards25519sha512batch_*()` functions have been
+tagged as deprecated.
+ - Undocumented symbols that were exported, but were only useful for
+internal purposes have been removed or made private:
+`sodium_runtime_get_cpu_features()`, the implementation-specific
+`crypto_onetimeauth_poly1305_donna()` symbols,
+`crypto_onetimeauth_poly1305_set_implementation()`,
+`crypto_onetimeauth_poly1305_implementation_name()` and
+`crypto_onetimeauth_pick_best_implementation()`.
+ - `sodium_compare()` now works as documented, and compares numbers
+in little-endian format instead of behaving like `memcmp()`.
+ - The previous changes should not break actual applications, but to be
+safe, the library version major was incremented.
+ - `sodium_runtime_has_ssse3()` and `sodium_runtime_has_sse41()` have
+been added.
+ - The library can now be compiled with the CompCert compiler.
+
 * Version 1.0.5
  - Compilation issues on some platforms were fixed: missing alignment
 directives were added (required at least on RHEL-6/i386), a workaround

data/vendor/libsodium/Makefile.in

@@ -268,7 +268,7 @@ CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
 CFLAGS_SSE3 = @CFLAGS_SSE3@
-CFLAGS_SSE4_1 = @CFLAGS_SSE4_1@
+CFLAGS_SSE41 = @CFLAGS_SSE41@
 CFLAGS_SSSE3 = @CFLAGS_SSSE3@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@

data/vendor/libsodium/THANKS

@@ -29,6 +29,7 @@ Michael Gorlick (@mgorlick)
 Michael Gregorowicz (@mgregoro)
 Omar Ayub (@electricFeel)
 Pedro Paixao (@paixaop)
+Project ArteMisc (@artemisc)
 Ruben De Visscher (@rubendv)
 Rudolf Von Krugstein (@rudolfvonkrugstein)
 Samuel Neves (@sneves)

data/vendor/libsodium/autom4te.cache/output.1

@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.5.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.6.
 @%:@
 @%:@ Report bugs to <https://github.com/jedisct1/libsodium/issues>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libsodium'
 PACKAGE_TARNAME='libsodium'
-PACKAGE_VERSION='1.0.5'
-PACKAGE_STRING='libsodium 1.0.5'
+PACKAGE_VERSION='1.0.6'
+PACKAGE_STRING='libsodium 1.0.6'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -654,7 +654,7 @@ HAVE_AMD64_ASM_FALSE
 HAVE_AMD64_ASM_TRUE
 CFLAGS_PCLMUL
 CFLAGS_AESNI
-CFLAGS_SSE4_1
+CFLAGS_SSE41
 CFLAGS_SSSE3
 CFLAGS_SSE3
 CFLAGS_SSE2
@@ -1368,7 +1368,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 libsodium 1.0.5 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1438,7 +1438,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.5:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1571,7 +1571,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.5
+libsodium configure 1.0.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1940,7 +1940,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 libsodium $as_me 1.0.5, which was
+It was created by libsodium $as_me 1.0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2876,7 +2876,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.5'
+ VERSION='1.0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3171,10 +3171,10 @@ fi
 ISODATE=`date +%Y-%m-%d`
 
 
-SODIUM_LIBRARY_VERSION_MAJOR=7
-SODIUM_LIBRARY_VERSION_MINOR=6
-DLL_VERSION=6
-SODIUM_LIBRARY_VERSION=16:0:3
+SODIUM_LIBRARY_VERSION_MAJOR=8
+SODIUM_LIBRARY_VERSION_MINOR=0
+DLL_VERSION=7
+SODIUM_LIBRARY_VERSION=17:0:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -15027,7 +15027,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse4_1" >&5
 $as_echo "$ax_cv_check_cflags___msse4_1" >&6; }
 if test "x$ax_cv_check_cflags___msse4_1" = xyes; then :
-  CFLAGS_SSE4_1="-msse4.1"
+  CFLAGS_SSE41="-msse4.1"
 else
   :
 fi
@@ -16769,7 +16769,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 libsodium $as_me 1.0.5, which was
+This file was extended by libsodium $as_me 1.0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16827,7 +16827,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="\\
-libsodium config.status 1.0.5
+libsodium config.status 1.0.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

data/vendor/libsodium/autom4te.cache/output.5

@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.5.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.6.
 @%:@
 @%:@ Report bugs to <https://github.com/jedisct1/libsodium/issues>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libsodium'
 PACKAGE_TARNAME='libsodium'
-PACKAGE_VERSION='1.0.5'
-PACKAGE_STRING='libsodium 1.0.5'
+PACKAGE_VERSION='1.0.6'
+PACKAGE_STRING='libsodium 1.0.6'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -654,7 +654,7 @@ HAVE_AMD64_ASM_FALSE
 HAVE_AMD64_ASM_TRUE
 CFLAGS_PCLMUL
 CFLAGS_AESNI
-CFLAGS_SSE4_1
+CFLAGS_SSE41
 CFLAGS_SSSE3
 CFLAGS_SSE3
 CFLAGS_SSE2
@@ -1368,7 +1368,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 libsodium 1.0.5 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1438,7 +1438,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.5:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1571,7 +1571,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.5
+libsodium configure 1.0.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1940,7 +1940,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 libsodium $as_me 1.0.5, which was
+It was created by libsodium $as_me 1.0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2876,7 +2876,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.5'
+ VERSION='1.0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3171,10 +3171,10 @@ fi
 ISODATE=`date +%Y-%m-%d`
 
 
-SODIUM_LIBRARY_VERSION_MAJOR=7
-SODIUM_LIBRARY_VERSION_MINOR=6
-DLL_VERSION=6
-SODIUM_LIBRARY_VERSION=16:0:3
+SODIUM_LIBRARY_VERSION_MAJOR=8
+SODIUM_LIBRARY_VERSION_MINOR=0
+DLL_VERSION=7
+SODIUM_LIBRARY_VERSION=17:0:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -15027,7 +15027,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___msse4_1" >&5
 $as_echo "$ax_cv_check_cflags___msse4_1" >&6; }
 if test "x$ax_cv_check_cflags___msse4_1" = xyes; then :
-  CFLAGS_SSE4_1="-msse4.1"
+  CFLAGS_SSE41="-msse4.1"
 else
   :
 fi
@@ -16769,7 +16769,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 libsodium $as_me 1.0.5, which was
+This file was extended by libsodium $as_me 1.0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16827,7 +16827,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="\\
-libsodium config.status 1.0.5
+libsodium config.status 1.0.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

data/vendor/libsodium/autom4te.cache/requests

@@ -47,197 +47,197 @@
                         'configure.ac'
                       ],
                       {
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
-                        'LT_PATH_NM' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
                         'LT_LIB_DLLOAD' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
                         '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'LT_PROG_GCJ' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'AM_SET_LEADING_DOT' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'LT_PATH_LD' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AM_PROG_AS' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AX_CHECK_LINK_FLAG' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_RUN_LOG' => 1,
                         '_AM_DEPENDENCIES' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
                         '_LT_AC_LANG_C_CONFIG' => 1,
-                        '_LT_AC_LOCK' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
                         'AC_LTDL_PREOPEN' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AU_DEFUN' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'LT_OUTPUT' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AC_DEFUN' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'LT_INIT' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
                         'LTDL_CONVENIENCE' => 1,
-                        'AC_PROG_NM' => 1,
-                        'gl_FUNC_ARGZ' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
                         '_LT_PROG_CXX' => 1,
+                        'LT_AC_PROG_SED' => 1,
                         'AC_LIBTOOL_PICMODE' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'LTDL_INIT' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'gl_PREREQ_ARGZ' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'PKG_PROG_PKG_CONFIG' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AC_LIBTOOL_FC' => 1,
                         'AC_ENABLE_FAST_INSTALL' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_m4_warn' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
                         'PKG_INSTALLDIR' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'include' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'm4_include' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'gl_LD_OUTPUT_DEF' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
                         'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'LT_AC_PROG_SED' => 1,
+                        '_LT_PROG_F77' => 1,
                         'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'LT_LANG' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'LT_PROG_GO' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'LT_PROG_RC' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_DEP_TRACK' => 1,
                         'AM_PROG_NM' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'AM_ENABLE_STATIC' => 1,
+                        'PKG_CHECK_MODULES' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
                         'AX_CHECK_COMPILE_FLAG' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'LT_WITH_LTDL' => 1,
                         'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AU_DEFUN' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
                         '_LT_CC_BASENAME' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_PROG_AS' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'include' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'PKG_NOARCH_INSTALLDIR' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_DEFUN' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
                         'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AM_ENABLE_SHARED' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'LT_LANG' => 1,
+                        'AM_DISABLE_STATIC' => 1,
                         'AC_DISABLE_STATIC' => 1,
-                        'm4_pattern_forbid' => 1,
                         'AC_LIBTOOL_F77' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'PKG_CHECK_MODULES' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'LT_INIT' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'm4_include' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'LT_PROG_RC' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'PKG_CHECK_VAR' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AM_PROG_LD' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LTDL_DLLIB' => 1,
                         'AC_PATH_MAGIC' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        '_m4_warn' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AX_CHECK_LINK_FLAG' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
                         '_LT_PROG_FC' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'gl_LD_OUTPUT_DEF' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'LTOPTIONS_VERSION' => 1
+                        'PKG_CHECK_EXISTS' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -252,65 +252,65 @@
                         'configure.ac'
                       ],
                       {
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'm4_sinclude' => 1,
-                        'sinclude' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        '_AM_COND_IF' => 1,
-                        '_m4_warn' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AM_NLS' => 1,
-                        'AC_CANONICAL_HOST' => 1,
                         'AC_FC_PP_DEFINE' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_NLS' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'LT_INIT' => 1,
+                        'AC_INIT' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_FC_FREEFORM' => 1,
                         'include' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AC_SUBST' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'sinclude' => 1,
                         'm4_include' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'm4_pattern_allow' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         '_AM_COND_ELSE' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_PATH_GUILE' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'LT_INIT' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'm4_sinclude' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AM_PROG_FC_C_O' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AC_INIT' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AM_PROG_AR' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        '_AM_COND_IF' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        '_m4_warn' => 1,
                         'AC_SUBST_TRACE' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         'AM_GNU_GETTEXT' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'm4_pattern_forbid' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_PROG_CXX_C_O' => 1
+                        'AC_FC_SRCEXT' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AC_PROG_LIBTOOL' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -338,216 +338,216 @@
                         '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/make.m4',
                         '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/missing.m4',
                         '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/options.m4',
-                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/prog-cc-c-o.m4',
-                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/runlog.m4',
-                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/sanity.m4',
-                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/silent.m4',
-                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/strip.m4',
-                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/substnot.m4',
-                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/tar.m4',
-                        'm4/ax_check_compile_flag.m4',
-                        'm4/ax_check_link_flag.m4',
-                        'm4/ld-output-def.m4',
-                        'm4/libtool.m4',
-                        'm4/ltoptions.m4',
-                        'm4/ltsugar.m4',
-                        'm4/ltversion.m4',
-                        'm4/lt~obsolete.m4',
-                        'm4/pkg.m4',
-                        'configure.ac'
-                      ],
-                      {
-                        'LT_PATH_NM' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'LT_OUTPUT' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AU_DEFUN' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'AC_DEFUN' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'gl_FUNC_ARGZ' => 1,
+                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/prog-cc-c-o.m4',
+                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/runlog.m4',
+                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/sanity.m4',
+                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/silent.m4',
+                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/strip.m4',
+                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/substnot.m4',
+                        '/usr/local/Cellar/automake/1.14.1/share/aclocal-1.14/tar.m4',
+                        'm4/ax_check_compile_flag.m4',
+                        'm4/ax_check_link_flag.m4',
+                        'm4/ld-output-def.m4',
+                        'm4/libtool.m4',
+                        'm4/ltoptions.m4',
+                        'm4/ltsugar.m4',
+                        'm4/ltversion.m4',
+                        'm4/lt~obsolete.m4',
+                        'm4/pkg.m4',
+                        'configure.ac'
+                      ],
+                      {
+                        'include' => 1,
                         '_AM_AUTOCONF_VERSION' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AC_PROG_NM' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
                         '_LTDL_SETUP' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AC_CHECK_LIBM' => 1,
+                        'm4_include' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
                         'AC_LTDL_DLSYM_USCORE' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'LTDL_INIT' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'gl_PREREQ_ARGZ' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'PKG_PROG_PKG_CONFIG' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'PKG_INSTALLDIR' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'gl_LD_OUTPUT_DEF' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
                         'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_PROG_LD' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'LT_LANG' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        '_LT_PROG_F77' => 1,
                         'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'LT_PROG_GO' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'LTDL_INIT' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
                         '_LT_PROG_LTMAIN' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AX_CHECK_COMPILE_FLAG' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_PROG_AS' => 1,
+                        'LT_PROG_RC' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
                         'AM_PROG_LIBTOOL' => 1,
-                        'include' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'LT_LIB_M' => 1,
                         'AC_PROG_LIBTOOL' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'PKG_CHECK_MODULES' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AX_CHECK_COMPILE_FLAG' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
                         'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'AU_DEFUN' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
                         '_LT_CC_BASENAME' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'm4_pattern_allow' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'PKG_NOARCH_INSTALLDIR' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'AC_DEFUN' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'LTVERSION_VERSION' => 1,
                         'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'LT_LANG' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'LT_PROG_GO' => 1,
                         'AC_CONFIG_MACRO_DIR' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AM_PROG_LD' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
                         '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'PKG_CHECK_MODULES' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'LT_PATH_LD' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
                         'm4_pattern_forbid' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        '_LT_LINKER_OPTION' => 1,
+                        'AM_SILENT_RULES' => 1,
                         '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'LT_INIT' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'm4_include' => 1,
+                        'AM_PROG_AS' => 1,
+                        'LT_PROG_GCJ' => 1,
                         'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'LTDL_INSTALLABLE' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
                         '_LT_AC_LANG_CXX' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
+                        'AX_CHECK_LINK_FLAG' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AC_ENABLE_STATIC' => 1,
                         'AC_LIB_LTDL' => 1,
-                        'PKG_CHECK_VAR' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'LT_PROG_RC' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        '_m4_warn' => 1,
-                        'LT_WITH_LTDL' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
                         '_LT_AC_TAGVAR' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AX_CHECK_LINK_FLAG' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'AM_RUN_LOG' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
                         'AC_LIBTOOL_RC' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'LTSUGAR_VERSION' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'LT_INIT' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'gl_LD_OUTPUT_DEF' => 1
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        '_m4_warn' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'PKG_INSTALLDIR' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -593,190 +593,190 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_MISSING_PROG' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'LT_INIT' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'm4_include' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'LT_PROG_RC' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        '_m4_warn' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AX_CHECK_LINK_FLAG' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'gl_LD_OUTPUT_DEF' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
                         'LTSUGAR_VERSION' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
                         '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'LT_PROG_RC' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_DEFUN_ONCE' => 1,
                         'LT_AC_PROG_RC' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AM_PROG_NM' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
                         'AC_LIBTOOL_CXX' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AM_DISABLE_STATIC' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'gl_LD_OUTPUT_DEF' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
                         'AM_MAKE_INCLUDE' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AX_CHECK_COMPILE_FLAG' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'm4_include' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'LTDL_INSTALLABLE' => 1,
                         'include' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_PROG_AS' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'LT_LIB_M' => 1,
-                        'm4_pattern_allow' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'LT_SYS_MODULE_PATH' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'AM_PROG_LD' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'LT_PROG_GO' => 1,
                         'AC_CONFIG_MACRO_DIR' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AM_DISABLE_STATIC' => 1,
                         'AC_DISABLE_STATIC' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'gl_FUNC_ARGZ' => 1,
-                        'AC_PROG_NM' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
                         '_LT_AC_FILE_LTDLL_C' => 1,
+                        'LT_LANG' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'AU_DEFUN' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
                         '_LT_LINKER_BOILERPLATE' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AX_CHECK_COMPILE_FLAG' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'AM_RUN_LOG' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AX_CHECK_LINK_FLAG' => 1,
                         '_AM_IF_OPTION' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AM_PROG_AS' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'LT_PATH_LD' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
                         'AC_CHECK_LIBM' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AM_DISABLE_SHARED' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
                         '_AC_PROG_LIBTOOL' => 1,
-                        'LTDL_INIT' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_m4_warn' => 1,
                         'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'gl_PREREQ_ARGZ' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AM_SET_DEPDIR' => 1,
                         'LT_AC_PROG_SED' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'LT_LANG' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'LT_PROG_GO' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
                         '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AM_CONDITIONAL' => 1,
                         'AC_LTDL_OBJDIR' => 1,
                         'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        '_AM_PROG_TAR' => 1,
                         '_LT_PATH_TOOL_PREFIX' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
                         '_LT_AC_LOCK' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_AM_DEPENDENCIES' => 1,
+                        'LT_INIT' => 1,
                         '_LT_AC_LANG_C_CONFIG' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'AC_DEFUN' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'LT_OUTPUT' => 1,
-                        'AU_DEFUN' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AC_LTDL_PREOPEN' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -822,190 +822,190 @@
                         'configure.ac'
                       ],
                       {
-                        'LT_PROG_RC' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
                         '_LT_AC_SYS_COMPILER' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        '_m4_warn' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AX_CHECK_LINK_FLAG' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'gl_LD_OUTPUT_DEF' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
                         'm4_pattern_forbid' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'LT_INIT' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'm4_include' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
                         'LT_FUNC_ARGZ' => 1,
                         'm4_pattern_allow' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        '_AM_SET_OPTIONS' => 1,
+                        'LT_PATH_LD' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AM_PROG_AS' => 1,
+                        'AC_CHECK_LIBM' => 1,
                         '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AM_PROG_NM' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_PROG_LD' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AM_PROG_LD' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'AX_CHECK_COMPILE_FLAG' => 1,
-                        'AM_ENABLE_STATIC' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_PROG_EGREP' => 1,
                         'AM_RUN_LOG' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_PROG_AS' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'include' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_AM_DEPENDENCIES' => 1,
                         'LT_AC_PROG_EGREP' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AX_CHECK_LINK_FLAG' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'LT_INIT' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
                         'LT_SYS_DLOPEN_SELF' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_PROG_LD' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        '_m4_warn' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_LT_PROG_F77' => 1,
                         'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'LT_LANG' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
                         'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'LT_PROG_GO' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AC_PROG_NM' => 1,
                         '_AM_AUTOCONF_VERSION' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
+                        'include' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'm4_include' => 1,
                         '_LTDL_SETUP' => 1,
-                        'LTDL_INIT' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AC_CHECK_LIBM' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'gl_LD_OUTPUT_DEF' => 1,
                         'AC_LTDL_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
                         'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AU_DEFUN' => 1,
-                        'LT_OUTPUT' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'AC_DEFUN' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
                         'LT_PATH_NM' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'LTDL_INIT' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AC_DEFUN_ONCE' => 1,
                         'AC_LTDL_SHLIBPATH' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        '_LT_PROG_F77' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'LT_PROG_RC' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
                         'LTVERSION_VERSION' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
                         'AC_DISABLE_SHARED' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AM_CONDITIONAL' => 1,
+                        'LT_LANG' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AX_CHECK_COMPILE_FLAG' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AU_DEFUN' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
                         'AC_LTDL_DLLIB' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'LT_PROG_GO' => 1,
                         'AM_SUBST_NOTMAKE' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_PROG_LD' => 1,
+                        'LTOBSOLETE_VERSION' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -1052,195 +1052,195 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_PROG_EGREP' => 1,
                         'LT_AC_PROG_EGREP' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
+                        'AM_RUN_LOG' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AX_CHECK_LINK_FLAG' => 1,
                         '_AM_SET_OPTION' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'LT_LANG' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'LT_PROG_GO' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'LT_PATH_LD' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AC_ENABLE_STATIC' => 1,
                         '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'AC_PROG_NM' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AM_MISSING_PROG' => 1,
                         '_AM_IF_OPTION' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
                         'AM_DISABLE_SHARED' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'LTDL_INIT' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        '_LT_AC_LANG_F77' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AM_PROG_AS' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
                         'LT_PROG_GCJ' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'AU_DEFUN' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'LT_OUTPUT' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AC_DEFUN' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'm4_pattern_allow' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'LT_FUNC_ARGZ' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
-                        'LT_PATH_NM' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
                         'AX_CHECK_DEFINED' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AM_CONDITIONAL' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AC_CHECK_DEFINE' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_m4_warn' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
                         'AC_LIBTOOL_GCJ' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'LT_PROG_RC' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'AX_CHECK_FUNC' => 1,
-                        '_m4_warn' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AX_CHECK_LINK_FLAG' => 1,
                         'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'LTOPTIONS_VERSION' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
                         'AC_LIBTOOL_RC' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'LT_INIT' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
                         'LTSUGAR_VERSION' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'LT_AC_PROG_RC' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'LT_PATH_NM' => 1,
                         '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'gl_LD_OUTPUT_DEF' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'LT_PROG_RC' => 1,
                         'AC_WITH_LTDL' => 1,
-                        'LT_INIT' => 1,
-                        'm4_include' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AC_CHECK_DEFINE' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'LT_FUNC_ARGZ' => 1,
-                        'm4_pattern_allow' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'LT_LIB_M' => 1,
+                        'AX_CHECK_FUNC' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
                         'AX_CHECK_DEFINE' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'AC_CHECK_DEFINED' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
                         'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
                         '_AM_PROG_CC_C_O' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AM_SET_DEPDIR' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'm4_include' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'gl_LD_OUTPUT_DEF' => 1,
                         'AC_LIBTOOL_CXX' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'include' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_CHECK_DEFINED' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'LT_PROG_GO' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
                         'AM_PROG_LD' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
+                        'AC_DISABLE_STATIC' => 1,
                         'AM_DISABLE_STATIC' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AM_ENABLE_STATIC' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'LT_LANG' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_DEFUN' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
                         'AX_CHECK_COMPILE_FLAG' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_PROG_AS' => 1,
-                        'include' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AU_DEFUN' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
                         'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        '_LT_CC_BASENAME' => 1
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1
                       }
                     ], 'Autom4te::Request' )
            );