rbnacl-libsodium 1.0.1 → 1.0.2

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

@@ -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.1.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.2.
 @%:@
 @%:@ 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.1'
-PACKAGE_STRING='libsodium 1.0.1'
+PACKAGE_VERSION='1.0.2'
+PACKAGE_STRING='libsodium 1.0.2'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -639,6 +639,9 @@ LIB@&t@OBJS
 HAVE_LD_OUTPUT_DEF_FALSE
 HAVE_LD_OUTPUT_DEF_TRUE
 AS
+EMSCRIPTEN_FALSE
+EMSCRIPTEN_TRUE
+TEST_LDFLAGS
 LIBTOOL_EXTRA_FLAGS
 HAVE_CPUID_V
 HAVE_TI_MODE_V
@@ -1353,7 +1356,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.1 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1423,7 +1426,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.1:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1444,7 +1447,8 @@ Optional Features:
   --disable-asm           Disable assembly implementations
   --disable-pie           Do not produce position independent executables
   --enable-blocking-random 
-                          Use /dev/random instead of /dev/urandom
+                          Enable this switch only if /dev/urandom is totally
+                          broken on the target platform
   --enable-minimal        Only compile the minimum set of functions required
                           for the high-level API
   --enable-debug          For maintainers only - please do not use
@@ -1550,7 +1554,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.1
+libsodium configure 1.0.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1919,7 +1923,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.1, which was
+It was created by libsodium $as_me 1.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2855,7 +2859,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.1'
+ VERSION='1.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3150,9 +3154,9 @@ ISODATE=`date +%Y-%m-%d`
 
 
 SODIUM_LIBRARY_VERSION_MAJOR=7
-SODIUM_LIBRARY_VERSION_MINOR=3
+SODIUM_LIBRARY_VERSION_MINOR=4
 DLL_VERSION=6
-SODIUM_LIBRARY_VERSION=13:3:0
+SODIUM_LIBRARY_VERSION=14:0:1
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -3172,6 +3176,13 @@ SODIUM_LIBRARY_VERSION=13:3:0
 LX_CFLAGS=${CFLAGS-NONE}
 
 
+if test pwd | fgrep ' ' > /dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The build directory contains whitespaces - This can cause tests/installation to fail due to limitations of some libtool versions" >&5
+$as_echo "$as_me: WARNING: The build directory contains whitespaces - This can cause tests/installation to fail due to limitations of some libtool versions" >&2;}
+
+fi
+
+
 @%:@ Check whether --enable-ssp was given.
 if test "${enable_ssp+set}" = set; then :
   enableval=$enable_ssp; 
@@ -5383,14 +5394,14 @@ fi
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fwrapv" >&5
-$as_echo_n "checking whether C compiler accepts -fwrapv... " >&6; }
-if ${ax_cv_check_cflags___fwrapv+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-strict-aliasing" >&5
+$as_echo_n "checking whether C compiler accepts -fno-strict-aliasing... " >&6; }
+if ${ax_cv_check_cflags___fno_strict_aliasing+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  -fwrapv"
+  CFLAGS="$CFLAGS  -fno-strict-aliasing"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -5403,29 +5414,29 @@ char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags___fwrapv=yes
+  ax_cv_check_cflags___fno_strict_aliasing=yes
 else
-  ax_cv_check_cflags___fwrapv=no
+  ax_cv_check_cflags___fno_strict_aliasing=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___fwrapv" >&5
-$as_echo "$ax_cv_check_cflags___fwrapv" >&6; }
-if test x"$ax_cv_check_cflags___fwrapv" = xyes; then :
-  CFLAGS="$CFLAGS -fwrapv"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_strict_aliasing" >&5
+$as_echo "$ax_cv_check_cflags___fno_strict_aliasing" >&6; }
+if test x"$ax_cv_check_cflags___fno_strict_aliasing" = xyes; then :
+  CFLAGS="$CFLAGS -fno-strict-aliasing"
 else
   :
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-strict-aliasing" >&5
-$as_echo_n "checking whether C compiler accepts -fno-strict-aliasing... " >&6; }
-if ${ax_cv_check_cflags___fno_strict_aliasing+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-strict-overflow" >&5
+$as_echo_n "checking whether C compiler accepts -fno-strict-overflow... " >&6; }
+if ${ax_cv_check_cflags___fno_strict_overflow+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  -fno-strict-aliasing"
+  CFLAGS="$CFLAGS  -fno-strict-overflow"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -5438,29 +5449,27 @@ char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags___fno_strict_aliasing=yes
+  ax_cv_check_cflags___fno_strict_overflow=yes
 else
-  ax_cv_check_cflags___fno_strict_aliasing=no
+  ax_cv_check_cflags___fno_strict_overflow=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___fno_strict_aliasing" >&5
-$as_echo "$ax_cv_check_cflags___fno_strict_aliasing" >&6; }
-if test x"$ax_cv_check_cflags___fno_strict_aliasing" = xyes; then :
-  CFLAGS="$CFLAGS -fno-strict-aliasing"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_strict_overflow" >&5
+$as_echo "$ax_cv_check_cflags___fno_strict_overflow" >&6; }
+if test x"$ax_cv_check_cflags___fno_strict_overflow" = xyes; then :
+  CFLAGS="$CFLAGS -fno-strict-overflow"
 else
-  :
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-strict-overflow" >&5
-$as_echo_n "checking whether C compiler accepts -fno-strict-overflow... " >&6; }
-if ${ax_cv_check_cflags___fno_strict_overflow+:} false; then :
+  
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fwrapv" >&5
+$as_echo_n "checking whether C compiler accepts -fwrapv... " >&6; }
+if ${ax_cv_check_cflags___fwrapv+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  -fno-strict-overflow"
+  CFLAGS="$CFLAGS  -fwrapv"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -5473,22 +5482,25 @@ char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
 }
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags___fno_strict_overflow=yes
+  ax_cv_check_cflags___fwrapv=yes
 else
-  ax_cv_check_cflags___fno_strict_overflow=no
+  ax_cv_check_cflags___fwrapv=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___fno_strict_overflow" >&5
-$as_echo "$ax_cv_check_cflags___fno_strict_overflow" >&6; }
-if test x"$ax_cv_check_cflags___fno_strict_overflow" = xyes; then :
-  CFLAGS="$CFLAGS -fno-strict-overflow"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fwrapv" >&5
+$as_echo "$ax_cv_check_cflags___fwrapv" >&6; }
+if test x"$ax_cv_check_cflags___fwrapv" = xyes; then :
+  CFLAGS="$CFLAGS -fwrapv"
 else
   :
 fi
 
 
+fi
+
+
 LIBTOOL_OLD_FLAGS="$LIBTOOL_EXTRA_FLAGS"
 LIBTOOL_EXTRA_FLAGS="$LIBTOOL_EXTRA_FLAGS -version-info $SODIUM_LIBRARY_VERSION"
 @%:@ Check whether --enable-soname-versions was given.
@@ -14577,9 +14589,7 @@ _ACEOF
 fi
 done
 
-
-fi
-for ac_func in mlock mprotect explicit_bzero posix_memalign
+  for ac_func in mmap mlock madvise mprotect explicit_bzero
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -14592,6 +14602,36 @@ fi
 done
 
 
+fi
+for ac_func in posix_memalign
+do :
+  ac_fn_c_check_func "$LINENO" "posix_memalign" "ac_cv_func_posix_memalign"
+if test "x$ac_cv_func_posix_memalign" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+@%:@define HAVE_POSIX_MEMALIGN 1
+_ACEOF
+ 
+fi
+done
+
+
+
+
+TEST_LDFLAGS=''
+if test "x$EMSCRIPTEN" != "x"; then :
+  
+  EXEEXT=.js
+  TEST_LDFLAGS='--pre-js pre.js.inc'
+
+fi
+
+ if test "x$EMSCRIPTEN" != "x"; then
+  EMSCRIPTEN_TRUE=
+  EMSCRIPTEN_FALSE='#'
+else
+  EMSCRIPTEN_TRUE='#'
+  EMSCRIPTEN_FALSE=
+fi
 
 
 
@@ -14941,13 +14981,7 @@ fi
 
 
 
-if test "x$PKG_CONFIG" != "x"; then :
-  
-  ac_config_files="$ac_config_files libsodium.pc"
-
-
-fi
-ac_config_files="$ac_config_files Makefile dist-build/Makefile msvc-scripts/Makefile src/Makefile src/libsodium/Makefile src/libsodium/include/Makefile src/libsodium/include/sodium/version.h test/default/Makefile test/Makefile"
+ac_config_files="$ac_config_files Makefile dist-build/Makefile libsodium.pc libsodium-uninstalled.pc msvc-scripts/Makefile src/Makefile src/libsodium/Makefile src/libsodium/include/Makefile src/libsodium/include/sodium/version.h test/default/Makefile test/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -15138,6 +15172,10 @@ 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
 fi
+if test -z "${EMSCRIPTEN_TRUE}" && test -z "${EMSCRIPTEN_FALSE}"; then
+  as_fn_error $? "conditional \"EMSCRIPTEN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_LD_OUTPUT_DEF_TRUE}" && test -z "${HAVE_LD_OUTPUT_DEF_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_LD_OUTPUT_DEF\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15539,7 +15577,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.1, which was
+This file was extended by libsodium $as_me 1.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15597,7 +15635,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.1
+libsodium config.status 1.0.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -15996,9 +16034,10 @@ do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "libsodium.pc") CONFIG_FILES="$CONFIG_FILES libsodium.pc" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "dist-build/Makefile") CONFIG_FILES="$CONFIG_FILES dist-build/Makefile" ;;
+    "libsodium.pc") CONFIG_FILES="$CONFIG_FILES libsodium.pc" ;;
+    "libsodium-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libsodium-uninstalled.pc" ;;
     "msvc-scripts/Makefile") CONFIG_FILES="$CONFIG_FILES msvc-scripts/Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "src/libsodium/Makefile") CONFIG_FILES="$CONFIG_FILES src/libsodium/Makefile" ;;

data/vendor/libsodium/autom4te.cache/requests

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