RubyGems - rbnacl-libsodium - Versions diffs - 1.0.0 → 1.0.1 - Mend

rbnacl-libsodium 1.0.0 → 1.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (83) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 071c127dcfd6684293ae23faa412e6b50e715d99
-  data.tar.gz: de4425a2264942d7ced04531489136407cb099e9
+  metadata.gz: c645d0125d12808a809a8c7de0b6ff79bb6cd3d0
+  data.tar.gz: ec8deca0ae399111f2623b4e6dbc3a39ad9006b0
 SHA512:
-  metadata.gz: c590ee15a483f0127709b5ccf6ce3ce61e6417a843ff5a1de81cade6dc48e296ebbd4c54587671d0faf8f3ae9a98eae3dd9415cba3a4f5be7b66c20039460bee
-  data.tar.gz: 4ef2ea438879dcbe91443b2ff4a507e2682ed8c126dcc151426f223edc14b3ffd5e00bdeaea17289828a23eeb15ea035e6c02382a23e80e98b3cc0a127ba9113
+  metadata.gz: 8ff98dfc4b8d48de229e2d2a3b161f0aa286d041f8e700de33088bbd85ac577fd5ef50ace267987bd574f0c38f7e7c7b60a5cb5f1ed0a26753f2a181feaeb33e
+  data.tar.gz: d08112930635b0f08f6db1828c75ad2c7db32dfcb39ee745d7f49d3ae1ec62a85e47d0b1f7f21e3cb4abad0000c348fb420314c21c53066cf74f24a8ddc37c27

data/CHANGES.md CHANGED Viewed

@@ -1,3 +1,7 @@
+1.0.1 (2014-11-25)
+------------------
+* Update to libsodium 1.0.1
 1.0.0 (2014-09-27)
 ------------------
 * Update to libsodium 1.0.0

data/lib/rbnacl/libsodium/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module RbNaCl
   module Libsodium
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/vendor/libsodium/ChangeLog CHANGED Viewed

@@ -1,4 +1,14 @@
+* Version 1.0.1
+ - DLL_EXPORT was renamed SODIUM_DLL_EXPORT in order to avoid
+collisions with similar macros defined by other libraries.
+ - sodium_bin2hex() is now constant-time.
+ - crypto_secretbox_detached() now supports overlapping input and output
+regions.
+ - NaCl's donna_c64 implementation of curve25519 was reading an extra byte
+past the end of the buffer containing the base point. This has been
+fixed.
 * Version 1.0.0
  - The API and ABI are now stable. New features will be added, but
 backward-compatibility is guaranteed through all the 1.x.y releases.

data/vendor/libsodium/LICENSE CHANGED Viewed

@@ -2,7 +2,7 @@
  * Copyright (c) 2013-2014
  * Frank Denis <j at pureftpd dot org>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

data/vendor/libsodium/Makefile.in CHANGED Viewed

@@ -83,8 +83,16 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/libsodium.pc.in \
 	$(top_srcdir)/src/libsodium/include/sodium/version.h.in \
-	AUTHORS ChangeLog README THANKS compile config.guess \
-	config.sub depcomp install-sh missing ltmain.sh
+	AUTHORS ChangeLog README THANKS compile build-aux/compile \
+	config.guess build-aux/config.guess config.sub \
+	build-aux/config.sub depcomp install-sh build-aux/install-sh \
+	missing build-aux/missing ltmain.sh build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \

data/vendor/libsodium/THANKS CHANGED Viewed

@@ -19,6 +19,7 @@ Jason McCampbell (@jasonmccampbell)
 Jeroen Habraken (@VeXocide)
 Joseph Abrahamson (@tel)
 Kenneth Ballenegger (@kballenegger)
+Loic Maury (@loicmaury)
 Michael Gorlick (@mgorlick)
 Michael Gregorowicz (@mgregoro)
 Omar Ayub (@electricFeel)

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

@@ -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.0.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.1.
 @%:@
 @%:@ 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.0'
-PACKAGE_STRING='libsodium 1.0.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='libsodium 1.0.1'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
@@ -1353,7 +1353,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.0 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.1 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1423,7 +1423,7 @@ fi
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.0:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.1:";;
    esac
   cat <<\_ACEOF
@@ -1550,7 +1550,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.0
+libsodium configure 1.0.1
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1919,7 +1919,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.0, which was
+It was created by libsodium $as_me 1.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   $ $0 $@
@@ -2267,10 +2267,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+for ac_dir in build-aux "$srcdir"/build-aux; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -2286,7 +2284,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
 fi
 # These three variables are undocumented and unsupported,
@@ -2298,6 +2296,8 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -2855,7 +2855,7 @@ fi
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.0'
+ VERSION='1.0.1'
 cat >>confdefs.h <<_ACEOF
@@ -3150,9 +3150,9 @@ ISODATE=`date +%Y-%m-%d`
 SODIUM_LIBRARY_VERSION_MAJOR=7
-SODIUM_LIBRARY_VERSION_MINOR=2
+SODIUM_LIBRARY_VERSION_MINOR=3
 DLL_VERSION=6
-SODIUM_LIBRARY_VERSION=13:2:0
+SODIUM_LIBRARY_VERSION=13:3:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -5115,7 +5115,42 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   $as_echo "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
-CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -D_FORTIFY_SOURCE=2" >&5
+$as_echo_n "checking whether C compiler accepts -D_FORTIFY_SOURCE=2... " >&6; }
+if ${ax_cv_check_cflags___D_FORTIFY_SOURCE_2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -D_FORTIFY_SOURCE=2"
+  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___D_FORTIFY_SOURCE_2=yes
+else
+  ax_cv_check_cflags___D_FORTIFY_SOURCE_2=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___D_FORTIFY_SOURCE_2" >&5
+$as_echo "$ax_cv_check_cflags___D_FORTIFY_SOURCE_2" >&6; }
+if test x"$ax_cv_check_cflags___D_FORTIFY_SOURCE_2" = xyes; then :
+  CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+else
+  :
+fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
 $as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
@@ -15504,7 +15539,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.0, which was
+This file was extended by libsodium $as_me 1.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -15562,7 +15597,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.0
+libsodium config.status 1.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

data/vendor/libsodium/autom4te.cache/output.3 CHANGED Viewed

@@ -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.0.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.1.
 @%:@
 @%:@ 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.0'
-PACKAGE_STRING='libsodium 1.0.0'
+PACKAGE_VERSION='1.0.1'
+PACKAGE_STRING='libsodium 1.0.1'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
@@ -1353,7 +1353,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.0 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.1 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1423,7 +1423,7 @@ fi
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.0:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.1:";;
    esac
   cat <<\_ACEOF
@@ -1550,7 +1550,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.0
+libsodium configure 1.0.1
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1919,7 +1919,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.0, which was
+It was created by libsodium $as_me 1.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   $ $0 $@
@@ -2267,10 +2267,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+for ac_dir in build-aux "$srcdir"/build-aux; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -2286,7 +2284,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
 fi
 # These three variables are undocumented and unsupported,
@@ -2298,6 +2296,8 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
 ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
   as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -2855,7 +2855,7 @@ fi
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.0'
+ VERSION='1.0.1'
 cat >>confdefs.h <<_ACEOF
@@ -3150,9 +3150,9 @@ ISODATE=`date +%Y-%m-%d`
 SODIUM_LIBRARY_VERSION_MAJOR=7
-SODIUM_LIBRARY_VERSION_MINOR=2
+SODIUM_LIBRARY_VERSION_MINOR=3
 DLL_VERSION=6
-SODIUM_LIBRARY_VERSION=13:2:0
+SODIUM_LIBRARY_VERSION=13:3:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -5115,7 +5115,42 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
   $as_echo "@%:@define _TANDEM_SOURCE 1" >>confdefs.h
-CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -D_FORTIFY_SOURCE=2" >&5
+$as_echo_n "checking whether C compiler accepts -D_FORTIFY_SOURCE=2... " >&6; }
+if ${ax_cv_check_cflags___D_FORTIFY_SOURCE_2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -D_FORTIFY_SOURCE=2"
+  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___D_FORTIFY_SOURCE_2=yes
+else
+  ax_cv_check_cflags___D_FORTIFY_SOURCE_2=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___D_FORTIFY_SOURCE_2" >&5
+$as_echo "$ax_cv_check_cflags___D_FORTIFY_SOURCE_2" >&6; }
+if test x"$ax_cv_check_cflags___D_FORTIFY_SOURCE_2" = xyes; then :
+  CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
+else
+  :
+fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
 $as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
@@ -15504,7 +15539,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.0, which was
+This file was extended by libsodium $as_me 1.0.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -15562,7 +15597,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.0
+libsodium config.status 1.0.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

data/vendor/libsodium/autom4te.cache/requests CHANGED Viewed

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