rbnacl-libsodium 1.0.6 → 1.0.7

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.6.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.7.
 @%:@
 @%:@ 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.6'
-PACKAGE_STRING='libsodium 1.0.6'
+PACKAGE_VERSION='1.0.7'
+PACKAGE_STRING='libsodium 1.0.7'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -649,6 +649,9 @@ HAVE_CPUID_V
 HAVE_TI_MODE_V
 HAVE_TI_MODE_FALSE
 HAVE_TI_MODE_TRUE
+HAVE_AVX_ASM_V
+HAVE_AVX_ASM_FALSE
+HAVE_AVX_ASM_TRUE
 HAVE_AMD64_ASM_V
 HAVE_AMD64_ASM_FALSE
 HAVE_AMD64_ASM_TRUE
@@ -803,6 +806,7 @@ enable_blocking_random
 enable_minimal
 with_safecode
 enable_debug
+enable_opt
 enable_soname_versions
 enable_shared
 enable_static
@@ -1368,7 +1372,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.6 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1438,7 +1442,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.6:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1464,6 +1468,8 @@ Optional Features:
   --enable-minimal        Only compile the minimum set of functions required
                           for the high-level API
   --enable-debug          For maintainers only - please do not use
+  --enable-opt            Optimize for the native CPU - The resulting library
+                          will be faster but not portable
   --enable-soname-versions 
                           enable soname versions (must be disabled for
                           Android) (default: enabled)
@@ -1571,7 +1577,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.6
+libsodium configure 1.0.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1940,7 +1946,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.6, which was
+It was created by libsodium $as_me 1.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2876,7 +2882,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.6'
+ VERSION='1.0.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3171,10 +3177,10 @@ fi
 ISODATE=`date +%Y-%m-%d`
 
 
-SODIUM_LIBRARY_VERSION_MAJOR=8
+SODIUM_LIBRARY_VERSION_MAJOR=9
 SODIUM_LIBRARY_VERSION_MINOR=0
-DLL_VERSION=7
-SODIUM_LIBRARY_VERSION=17:0:0
+DLL_VERSION=8
+SODIUM_LIBRARY_VERSION=18:0:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -3352,6 +3358,18 @@ fi
 fi
 
 
+@%:@ Check whether --enable-opt was given.
+if test "${enable_opt+set}" = set; then :
+  enableval=$enable_opt; 
+  if test "x$enableval" = "xyes"; then :
+  
+    CFLAGS="$CFLAGS -flto -march=native"
+    LDFLAGS="$LDFLAGS -flto -march=native"
+fi
+
+fi
+
+
 
 
 
@@ -15032,6 +15050,106 @@ else
   :
 fi
 
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS="$oldcflags"
+
+  oldcflags="$CFLAGS"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mavx" >&5
+$as_echo_n "checking whether C compiler accepts -mavx... " >&6; }
+if ${ax_cv_check_cflags___mavx+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -mavx"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___mavx=yes
+else
+  ax_cv_check_cflags___mavx=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx" >&5
+$as_echo "$ax_cv_check_cflags___mavx" >&6; }
+if test "x$ax_cv_check_cflags___mavx" = xyes; then :
+  CFLAGS="$CFLAGS -mavx"
+else
+  :
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX instructions set" >&5
+$as_echo_n "checking for AVX instructions set... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#pragma GCC target("avx")
+#include <immintrin.h>
+
+int
+main ()
+{
+ _mm256_zeroall(); 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     
+$as_echo "@%:@define HAVE_AVXINTRIN_H 1" >>confdefs.h
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mavx" >&5
+$as_echo_n "checking whether C compiler accepts -mavx... " >&6; }
+if ${ax_cv_check_cflags___mavx+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -mavx"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___mavx=yes
+else
+  ax_cv_check_cflags___mavx=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx" >&5
+$as_echo "$ax_cv_check_cflags___mavx" >&6; }
+if test "x$ax_cv_check_cflags___mavx" = xyes; then :
+  CFLAGS_AVX="-mavx"
+else
+  :
+fi
+
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -15538,8 +15656,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 HAVE_AMD64_ASM_V=0
 if test "$enable_asm" != "no"; then :
   
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we should use x86_64 asm code" >&5
-$as_echo_n "checking whether we should use x86_64 asm code... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can use x86_64 asm code" >&5
+$as_echo_n "checking whether we can use x86_64 asm code... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15556,7 +15674,13 @@ main ()
 #else
 # error !x86_64
 #endif
-__asm__("pxor %xmm12,%xmm6");
+unsigned char i = 0, o = 0, t;
+__asm__ __volatile__ ("pxor %%xmm12, %%xmm6 \n"
+                      "movb (%[i]), %[t] \n"
+                      "addb %[t], (%[o]) \n"
+                      : [t] "=&r"(t)
+                      : [o] "D"(&o), [i] "S"(&i)
+                      : "memory", "flags", "cc");
 
   ;
   return 0;
@@ -15586,27 +15710,83 @@ fi
 
 
 
+HAVE_AVX_ASM_V=0
+if test "$enable_asm" != "no"; then :
+  
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can assemble AVX opcodes" >&5
+$as_echo_n "checking whether we can assemble AVX opcodes... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  
+int
+main ()
+{
+
+#if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
+# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
+#  error Windows x86_64 calling conventions are not supported yet
+# endif
+/* neat */
+#else
+# error !x86_64
+#endif
+__asm__ __volatile__ ("vpunpcklqdq %xmm0,%xmm13,%xmm0");
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+   
+$as_echo "@%:@define HAVE_AVX_ASM 1" >>confdefs.h
+
+   HAVE_AVX_ASM_V=1
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+ if test $HAVE_AVX_ASM_V = 1; then
+  HAVE_AVX_ASM_TRUE=
+  HAVE_AVX_ASM_FALSE='#'
+else
+  HAVE_AVX_ASM_TRUE='#'
+  HAVE_AVX_ASM_FALSE=
+fi
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 128-bit arithmetic" >&5
 $as_echo_n "checking for 128-bit arithmetic... " >&6; }
 HAVE_TI_MODE_V=0
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#ifndef __GNUC__
-# error mode(TI) is a gcc extension
+#if !defined(__GNUC__) && !defined(__SIZEOF_INT128__)
+# error mode(TI) is a gcc extension, and __int128 is not available
 #endif
 #if defined(__clang__) && !defined(__x86_64__)
-# error clang does not properly compile smult_curve25519_donna_c64.c
+# error clang does not properly handle the 128-bit type on 32-bit systems
 #endif
 #ifndef NATIVE_LITTLE_ENDIAN
-# error donna_c64 currently requires a little endian CPU
+# error libsodium currently expects a little endian CPU for the 128-bit type
 #endif
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 # error emscripten currently supports only shift operations on integers \
 #       larger than 64 bits
 #endif
+#include <stddef.h>
 #include <stdint.h>
+#if defined(__SIZEOF_INT128__)
+typedef unsigned __int128 uint128_t;
+#else
 typedef unsigned uint128_t __attribute__((mode(TI)));
+#endif
 void fcontract(uint128_t *t) {
   *t += 0x8000000000000 - 1;
 }
@@ -15744,12 +15924,12 @@ esac
 if test "x$aligned_access_required" = "xyes"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-   
-$as_echo "@%:@define CPU_ALIGNED_ACCESS_REQUIRED 1" >>confdefs.h
-
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+   
+$as_echo "@%:@define CPU_UNALIGNED_ACCESS 1" >>confdefs.h
+
 fi
 
 
@@ -16356,6 +16536,10 @@ if test -z "${HAVE_AMD64_ASM_TRUE}" && test -z "${HAVE_AMD64_ASM_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_AMD64_ASM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_AVX_ASM_TRUE}" && test -z "${HAVE_AVX_ASM_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_AVX_ASM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_TI_MODE_TRUE}" && test -z "${HAVE_TI_MODE_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_TI_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16769,7 +16953,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.6, which was
+This file was extended by libsodium $as_me 1.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16827,7 +17011,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.6
+libsodium config.status 1.0.7
 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'
                       ],
                       {
-                        'AC_CHECK_LIBM' => 1,
-                        'AC_PROG_LD' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'm4_include' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'LT_PROG_GO' => 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,
+                        'gl_LD_OUTPUT_DEF' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 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,
+                        'AM_ENABLE_STATIC' => 1,
+                        '_LT_AC_TAGVAR' => 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,
+                        'AX_CHECK_COMPILE_FLAG' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
                         'AC_LIB_LTDL' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'LT_OUTPUT' => 1,
+                        'PKG_CHECK_MODULES' => 1,
+                        'LT_WITH_LTDL' => 1,
                         'AM_ENABLE_SHARED' => 1,
-                        'AC_PROG_NM' => 1,
-                        'AM_RUN_LOG' => 1,
-                        '_AM_DEPENDENCIES' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'gl_FUNC_ARGZ' => 1,
                         'LT_AC_PROG_EGREP' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_CHECK_LIBM' => 1,
                         'AC_LIBTOOL_RC' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'AX_CHECK_LINK_FLAG' => 1,
+                        'PKG_INSTALLDIR' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'LT_PROG_RC' => 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,
+                        '_LTDL_SETUP' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'LT_AC_PROG_RC' => 1,
                         'LT_SYS_DLSEARCH_PATH' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
                         'AC_LTDL_OBJDIR' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_PROG_CXX' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
                         'LT_AC_PROG_SED' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AU_DEFUN' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
                         'AC_PROG_LD_GNU' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        '_m4_warn' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
                         'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'LT_OUTPUT' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'PKG_INSTALLDIR' => 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,
+                        'AM_DEP_TRACK' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
                         'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'LT_LANG' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        'AM_PROG_AS' => 1,
+                        'LT_INIT' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
                         '_LT_PROG_F77' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'PKG_CHECK_VAR' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AC_LIBTOOL_FC' => 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,
+                        'include' => 1,
                         'AC_PROG_LIBTOOL' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'LTSUGAR_VERSION' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 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,
-                        'PKG_CHECK_MODULES' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'AX_CHECK_COMPILE_FLAG' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_AM_SET_OPTIONS' => 1,
                         '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AU_DEFUN' => 1,
-                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'AC_DEFUN' => 1,
+                        '_m4_warn' => 1,
+                        'AC_PROG_NM' => 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,
+                        'AM_PROG_NM' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
                         '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 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_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
                         'AC_DISABLE_STATIC' => 1,
-                        'AC_LIBTOOL_F77' => 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,
-                        'AM_ENABLE_STATIC' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'PKG_CHECK_EXISTS' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -252,65 +252,65 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AM_NLS' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'LT_INIT' => 1,
-                        'AC_INIT' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_PROG_MOC' => 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,
+                        'AC_INIT' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'AM_POT_TOOLS' => 1,
+                        '_m4_warn' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AM_SILENT_RULES' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
                         'sinclude' => 1,
-                        'm4_include' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_LIBSOURCE' => 1,
+                        'AC_CONFIG_FILES' => 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,
-                        'AM_PATH_GUILE' => 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,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'm4_sinclude' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'LT_INIT' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
                         'AM_PROG_CXX_C_O' => 1,
-                        'AH_OUTPUT' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_NLS' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
-                        'AM_PROG_FC_C_O' => 1,
+                        '_AM_COND_ENDIF' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
                         '_AM_COND_IF' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        '_m4_warn' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_CONFIG_FILES' => 1,
+                        'm4_include' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_LIBSOURCE' => 1,
                         'AM_PROG_F77_C_O' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AC_CANONICAL_HOST' => 1,
+                        'AH_OUTPUT' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'include' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        '_AM_COND_ELSE' => 1,
                         '_AM_MAKEFILE_INCLUDE' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AC_PROG_LIBTOOL' => 1
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AM_ENABLE_MULTILIB' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -357,197 +357,197 @@
                         'configure.ac'
                       ],
                       {
-                        '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,
-                        '_LTDL_SETUP' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AM_RUN_LOG' => 1,
                         'm4_include' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
                         'gl_LD_OUTPUT_DEF' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AX_CHECK_COMPILE_FLAG' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIB_LTDL' => 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_LIBTOOL_PROG_CC_C_O' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'LT_LIB_M' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AM_PROG_LD' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        '_AM_PROG_TAR' => 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,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        '_LT_PROG_LTMAIN' => 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,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_DISABLE_STATIC' => 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,
+                        'AM_MAINTAINER_MODE' => 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_DEFUN' => 1,
-                        'gl_PREREQ_ARGZ' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
                         'LTOPTIONS_VERSION' => 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,
-                        '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_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_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,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
                         '_LT_LIBOBJ' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
+                        'AX_CHECK_LINK_FLAG' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'PKG_INSTALLDIR' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'LT_PROG_RC' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AM_MISSING_PROG' => 1,
                         'LT_PATH_LD' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_SILENT_RULES' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
                         '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AM_PROG_AS' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AU_DEFUN' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
                         'LT_PROG_GCJ' => 1,
                         'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'PKG_PROG_PKG_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'LT_LANG' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'm4_pattern_allow' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 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,
-                        'AX_CHECK_LINK_FLAG' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
                         '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        '_LT_AC_TAGVAR' => 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,
-                        'AC_LTDL_PREOPEN' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        '_LT_AC_LOCK' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
+                        'AM_PROG_AS' => 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,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'include' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        'AC_PROG_NM' => 1,
                         'LTDL_CONVENIENCE' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        '_m4_warn' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_PROG_LD' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 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
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        '_LT_AC_SHELL_INIT' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -593,190 +593,190 @@
                         'configure.ac'
                       ],
                       {
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'LTSUGAR_VERSION' => 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,
+                        '_LTDL_SETUP' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AM_MISSING_PROG' => 1,
                         'LT_AC_PROG_RC' => 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,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'LTDL_INSTALLABLE' => 1,
                         'AC_LTDL_ENABLE_INSTALL' => 1,
-                        '_LT_PROG_F77' => 1,
+                        '_AM_SET_OPTION' => 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,
-                        '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,
-                        '_LTDL_SETUP' => 1,
-                        'm4_include' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'AX_CHECK_LINK_FLAG' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'LT_PROG_RC' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AC_LIBTOOL_RC' => 1,
                         'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'include' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
                         '_AM_AUTOCONF_VERSION' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'gl_FUNC_ARGZ' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'LT_OUTPUT' => 1,
                         '_LT_PROG_FC' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
                         'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AM_PROG_LD' => 1,
                         'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'AC_PATH_MAGIC' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'm4_pattern_forbid' => 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_AC_PROG_GCJ' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AX_CHECK_COMPILE_FLAG' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'm4_include' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'LTVERSION_VERSION' => 1,
                         'LT_PROG_GO' => 1,
+                        'gl_LD_OUTPUT_DEF' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
                         'AC_CONFIG_MACRO_DIR' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AC_DISABLE_STATIC' => 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_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 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,
+                        'AC_DEFUN_ONCE' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 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,
-                        '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_DISABLE_STATIC' => 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_MANGLE_OPTION' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_m4_warn' => 1,
+                        'AC_PROG_NM' => 1,
+                        'gl_PREREQ_ARGZ' => 1,
+                        'AM_PROG_NM' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
                         '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
                         'AC_PROG_LD' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'gl_FUNC_ARGZ' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'include' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
                         '_LT_AC_LANG_RC_CONFIG' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'LT_INIT' => 1,
+                        'AM_PROG_AS' => 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_SETUP' => 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,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'LTDL_INIT' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'LT_LANG' => 1,
                         'AM_SET_DEPDIR' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'LTDL_CONVENIENCE' => 1,
                         'LT_SYS_DLOPEN_SELF' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AU_DEFUN' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
                         '_LT_AC_LOCK' => 1,
-                        'LT_INIT' => 1,
+                        'AC_DISABLE_SHARED' => 1,
                         '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'AC_LTDL_PREOPEN' => 1
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'LT_AC_PROG_SED' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -822,190 +822,190 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_LIBTOOL_SETUP' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'LTSUGAR_VERSION' => 1,
                         'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'm4_include' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'LT_PROG_GO' => 1,
+                        'gl_LD_OUTPUT_DEF' => 1,
                         '_LT_AC_SYS_COMPILER' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
                         'm4_pattern_forbid' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'LT_FUNC_ARGZ' => 1,
-                        'm4_pattern_allow' => 1,
-                        'LT_PATH_LD' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'LT_PROG_GCJ' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        '_LT_AC_TAGVAR' => 1,
                         'LT_AC_PROG_GCJ' => 1,
-                        'AM_PROG_AS' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
+                        'AX_CHECK_COMPILE_FLAG' => 1,
                         'LT_LIB_DLLOAD' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
                         'AC_LIB_LTDL' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'AM_RUN_LOG' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'LT_AC_PROG_EGREP' => 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_LIBTOOL_GCJ' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        '_LT_COMPILER_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,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'LT_PROG_RC' => 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,
-                        'LT_OUTPUT' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
+                        '_LTDL_SETUP' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
                         '_AC_PROG_LIBTOOL' => 1,
-                        'AM_AUTOMAKE_VERSION' => 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_ENABLE_SHARED' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'LT_AC_PROG_EGREP' => 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,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'include' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'm4_include' => 1,
-                        '_LTDL_SETUP' => 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_CXX' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'LT_PATH_NM' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AC_LIBTOOL_RC' => 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_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,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
                         'LTOPTIONS_VERSION' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
                         'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'LT_LANG' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_LT_PROG_CXX' => 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,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
                         'AC_LTDL_DLLIB' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'LT_LANG' => 1,
                         'AC_ENABLE_SHARED' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        '_LT_AC_LANG_F77' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'm4_pattern_allow' => 1,
+                        'LT_FUNC_ARGZ' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 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,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AU_DEFUN' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        '_m4_warn' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_PROG_NM' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
                         'AC_CONFIG_MACRO_DIR' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        'AM_PROG_AS' => 1,
+                        'LT_INIT' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'LTDL_INIT' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'include' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'AC_LIBTOOL_F77' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AM_PROG_LD' => 1,
-                        'LTOBSOLETE_VERSION' => 1
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -1052,195 +1052,195 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_PROG_EGREP' => 1,
-                        'LT_AC_PROG_EGREP' => 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,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AC_CHECK_DEFINE' => 1,
                         'AM_MISSING_PROG' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'AM_DISABLE_SHARED' => 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,
-                        '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,
-                        '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_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_PROG_EGREP' => 1,
+                        'LT_PROG_RC' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
                         'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 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,
+                        'LTOBSOLETE_VERSION' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AX_CHECK_LINK_FLAG' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 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_AUTOCONF_VERSION' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AX_CHECK_DEFINED' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
                         'AM_MAINTAINER_MODE' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_LT_DLL_DEF_P' => 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,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'LT_PATH_NM' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
                         '_LT_AC_LANG_CXX_CONFIG' => 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,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'LTDL_INIT' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'LT_PATH_NM' => 1,
+                        '_LT_AC_TAGCONFIG' => 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,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'm4_include' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'AM_PROG_LD' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 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,
-                        '_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,
+                        'LT_SUPPORTED_TAG' => 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,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AX_CHECK_DEFINE' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
                         '_LT_AC_LANG_F77' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AC_PATH_MAGIC' => 1,
+                        'AX_CHECK_COMPILE_FLAG' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
                         'AM_SUBST_NOTMAKE' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'gl_LD_OUTPUT_DEF' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'm4_include' => 1,
+                        'AM_RUN_LOG' => 1,
                         'LT_PROG_GO' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'AM_PROG_LD' => 1,
+                        'AC_DEFUN' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'LT_LIB_M' => 1,
+                        'AC_DEFUN_ONCE' => 1,
                         'AC_DISABLE_STATIC' => 1,
-                        'AM_DISABLE_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,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 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,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'AU_DEFUN' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_PROG_NM' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_AM_SET_OPTIONS' => 1,
                         '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        '_m4_warn' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'include' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_LT_PROG_F77' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AX_CHECK_FUNC' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AM_PROG_AS' => 1,
+                        'LT_INIT' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
                         'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'm4_pattern_allow' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'LT_FUNC_ARGZ' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'AC_CHECK_DEFINED' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'LT_LANG' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
                         'AM_DEP_TRACK' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1
+                        '_LT_LINKER_OPTION' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AU_DEFUN' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1
                       }
                     ], 'Autom4te::Request' )
            );