diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index af03e56..84a0a1b 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for mtrace-ng 0.5.
+@%:@ Generated by GNU Autoconf 2.69 for mtrace-ng 0.6.
 @%:@
 @%:@ Report bugs to <stefani@seibold.net>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mtrace-ng'
 PACKAGE_TARNAME='mtrace-ng'
-PACKAGE_VERSION='0.5'
-PACKAGE_STRING='mtrace-ng 0.5'
+PACKAGE_VERSION='0.6'
+PACKAGE_STRING='mtrace-ng 0.6'
 PACKAGE_BUGREPORT='stefani@seibold.net'
 PACKAGE_URL=''
 
@@ -1329,7 +1329,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 mtrace-ng 0.5 to adapt to many kinds of systems.
+\`configure' configures mtrace-ng 0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1399,7 +1399,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mtrace-ng 0.5:";;
+     short | recursive ) echo "Configuration of mtrace-ng 0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1518,7 +1518,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mtrace-ng configure 0.5
+mtrace-ng configure 0.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2124,7 +2124,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 mtrace-ng $as_me 0.5, which was
+It was created by mtrace-ng $as_me 0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -12006,7 +12006,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mtrace-ng'
- VERSION='0.5'
+ VERSION='0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13893,7 +13893,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 mtrace-ng $as_me 0.5, which was
+This file was extended by mtrace-ng $as_me 0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13959,7 +13959,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="\\
-mtrace-ng config.status 0.5
+mtrace-ng config.status 0.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index af03e56..84a0a1b 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for mtrace-ng 0.5.
+@%:@ Generated by GNU Autoconf 2.69 for mtrace-ng 0.6.
 @%:@
 @%:@ Report bugs to <stefani@seibold.net>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mtrace-ng'
 PACKAGE_TARNAME='mtrace-ng'
-PACKAGE_VERSION='0.5'
-PACKAGE_STRING='mtrace-ng 0.5'
+PACKAGE_VERSION='0.6'
+PACKAGE_STRING='mtrace-ng 0.6'
 PACKAGE_BUGREPORT='stefani@seibold.net'
 PACKAGE_URL=''
 
@@ -1329,7 +1329,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 mtrace-ng 0.5 to adapt to many kinds of systems.
+\`configure' configures mtrace-ng 0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1399,7 +1399,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mtrace-ng 0.5:";;
+     short | recursive ) echo "Configuration of mtrace-ng 0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1518,7 +1518,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mtrace-ng configure 0.5
+mtrace-ng configure 0.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2124,7 +2124,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 mtrace-ng $as_me 0.5, which was
+It was created by mtrace-ng $as_me 0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -12006,7 +12006,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mtrace-ng'
- VERSION='0.5'
+ VERSION='0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13893,7 +13893,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 mtrace-ng $as_me 0.5, which was
+This file was extended by mtrace-ng $as_me 0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13959,7 +13959,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="\\
-mtrace-ng config.status 0.5
+mtrace-ng config.status 0.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/autom4te.cache/output.2 b/autom4te.cache/output.2
index af03e56..84a0a1b 100644
--- a/autom4te.cache/output.2
+++ b/autom4te.cache/output.2
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for mtrace-ng 0.5.
+@%:@ Generated by GNU Autoconf 2.69 for mtrace-ng 0.6.
 @%:@
 @%:@ Report bugs to <stefani@seibold.net>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mtrace-ng'
 PACKAGE_TARNAME='mtrace-ng'
-PACKAGE_VERSION='0.5'
-PACKAGE_STRING='mtrace-ng 0.5'
+PACKAGE_VERSION='0.6'
+PACKAGE_STRING='mtrace-ng 0.6'
 PACKAGE_BUGREPORT='stefani@seibold.net'
 PACKAGE_URL=''
 
@@ -1329,7 +1329,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 mtrace-ng 0.5 to adapt to many kinds of systems.
+\`configure' configures mtrace-ng 0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1399,7 +1399,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mtrace-ng 0.5:";;
+     short | recursive ) echo "Configuration of mtrace-ng 0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1518,7 +1518,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mtrace-ng configure 0.5
+mtrace-ng configure 0.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2124,7 +2124,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 mtrace-ng $as_me 0.5, which was
+It was created by mtrace-ng $as_me 0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -12006,7 +12006,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mtrace-ng'
- VERSION='0.5'
+ VERSION='0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13893,7 +13893,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 mtrace-ng $as_me 0.5, which was
+This file was extended by mtrace-ng $as_me 0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13959,7 +13959,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="\\
-mtrace-ng config.status 0.5
+mtrace-ng config.status 0.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index ef2139e..679c2a1 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -42,186 +42,186 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'm4_pattern_allow' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_LT_DLL_DEF_P' => 1,
                         'AC_ENABLE_SHARED' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'LT_PROG_RC' => 1,
-                        'LT_LIB_M' => 1,
+                        '_m4_warn' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
                         'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'm4_include' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
                         'LTDL_INSTALLABLE' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'include' => 1,
-                        'LTDL_INIT' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        'LT_FUNC_ARGZ' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'LT_PATH_NM' => 1,
                         'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
                         'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_LTDL_SETUP' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        '_m4_warn' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'm4_pattern_forbid' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'LT_LANG' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'LT_FUNC_ARGZ' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AC_DEFUN' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_PROG_NM' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        'AU_DEFUN' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        'LT_PROG_GO' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AM_PROG_LD' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LT_INIT' => 1,
-                        'LT_PATH_LD' => 1,
-                        'LT_OUTPUT' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AM_PROG_NM' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'LT_PROG_GCJ' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_LT_AC_LANG_F77' => 1,
                         'LTSUGAR_VERSION' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'LT_PROG_RC' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'include' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        '_LT_PROG_CXX' => 1,
                         'AC_PROG_LIBTOOL' => 1,
-                        '_LT_LIBOBJ' => 1
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'LTDL_INIT' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AM_PROG_NM' => 1,
+                        'LT_PATH_LD' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'LT_LANG' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AU_DEFUN' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'LT_INIT' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AC_DEFUN' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'm4_include' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'LT_OUTPUT' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'LT_LIB_M' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'm4_pattern_allow' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -263,186 +263,186 @@
                         'configure.ac'
                       ],
                       {
-                        'LT_FUNC_ARGZ' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AC_DEFUN' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AC_PROG_NM' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'AU_DEFUN' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'LT_LANG' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        'AM_PROG_NM' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'LT_OUTPUT' => 1,
-                        'LT_INIT' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'LT_PROG_GO' => 1,
                         '_AM_SET_OPTIONS' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        'AM_PROG_LD' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'LT_LIB_M' => 1,
-                        'LT_PROG_RC' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        'm4_include' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'include' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
                         'AM_ENABLE_STATIC' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'LTDL_INIT' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AC_PROG_LD' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'm4_pattern_allow' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        '_LTDL_SETUP' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        '_m4_warn' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        'AC_DISABLE_STATIC' => 1,
+                        'LT_PROG_GO' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
                         'AC_CONFIG_MACRO_DIR' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AU_DEFUN' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'LT_LANG' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'LT_PATH_LD' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AM_PROG_NM' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'm4_include' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        'AC_DEFUN' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'LT_INIT' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'AM_PROG_LD' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'LT_LIB_M' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
                         'AM_DISABLE_SHARED' => 1,
                         'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        '_LT_PROG_F77' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        '_LT_PROG_FC' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'LTOPTIONS_VERSION' => 1,
+                        'LT_FUNC_ARGZ' => 1,
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        '_m4_warn' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AM_SILENT_RULES' => 1,
                         'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'LT_PROG_RC' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AC_PROG_NM' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'include' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'LTDL_INIT' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AM_RUN_LOG' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -457,65 +457,65 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_SUBST_TRACE' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AH_OUTPUT' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'm4_pattern_forbid' => 1,
                         'AM_MAINTAINER_MODE' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_SILENT_RULES' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
                         'AC_CONFIG_HEADERS' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'include' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AM_PROG_AR' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'm4_sinclude' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'AC_LIBSOURCE' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'AC_INIT' => 1,
-                        'sinclude' => 1,
-                        'AM_NLS' => 1,
-                        'AC_SUBST' => 1,
-                        '_m4_warn' => 1,
-                        'AM_PROG_CC_C_O' => 1,
+                        'AC_CONFIG_FILES' => 1,
                         'LT_SUPPORTED_TAG' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'LT_INIT' => 1,
-                        'AM_CONDITIONAL' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'include' => 1,
+                        'AM_NLS' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'm4_sinclude' => 1,
+                        '_m4_warn' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'sinclude' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AH_OUTPUT' => 1,
                         'm4_include' => 1,
-                        'AM_PROG_F77_C_O' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
                         '_LT_AC_TAGCONFIG' => 1,
-                        'AC_CANONICAL_HOST' => 1
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'LT_INIT' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff --git a/autom4te.cache/traces.2 b/autom4te.cache/traces.2
index 262b55b..1fe5590 100644
--- a/autom4te.cache/traces.2
+++ b/autom4te.cache/traces.2
@@ -3,7 +3,7 @@ m4trace:aclocal.m4:1190: -1- m4_include([config/m4/ltoptions.m4])
 m4trace:aclocal.m4:1191: -1- m4_include([config/m4/ltsugar.m4])
 m4trace:aclocal.m4:1192: -1- m4_include([config/m4/ltversion.m4])
 m4trace:aclocal.m4:1193: -1- m4_include([config/m4/lt~obsolete.m4])
-m4trace:configure.ac:27: -1- AC_INIT([mtrace-ng], [0.5], [stefani@seibold.net])
+m4trace:configure.ac:27: -1- AC_INIT([mtrace-ng], [0.6], [stefani@seibold.net])
 m4trace:configure.ac:27: -1- m4_pattern_forbid([^_?A[CHUM]_])
 m4trace:configure.ac:27: -1- m4_pattern_forbid([_AC_])
 m4trace:configure.ac:27: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
diff --git a/config/autoconf/config.guess b/config/autoconf/config.guess
index 17a4f70..a2eeec3 100755
--- a/config/autoconf/config.guess
+++ b/config/autoconf/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-07-03'
+timestamp='2016-04-02'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ timestamp='2015-07-03'
 # Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 #
 # Please send patches to <config-patches@gnu.org>.
 
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -237,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -249,6 +253,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
+    *:Sortix:*:*)
+	echo ${UNAME_MACHINE}-unknown-sortix
+	exit ;;
     alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -265,42 +272,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -373,16 +380,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	SUN_ARCH=i386
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -407,7 +414,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -632,13 +639,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -677,11 +684,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -694,12 +701,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -804,14 +811,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -893,7 +900,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -916,7 +923,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -962,6 +969,9 @@ EOF
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
+    k1om:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
@@ -1128,7 +1138,7 @@ EOF
 	# uname -m prints for DJGPP always 'pc', but it prints nothing about
 	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
+	# prints for the "djgpp" host, or else GDB configure will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
 	exit ;;
@@ -1277,6 +1287,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1290,9 +1303,9 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1314,7 +1327,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1345,7 +1358,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1387,7 +1400,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1398,6 +1411,9 @@ EOF
     x86_64:VMkernel:*:*)
 	echo ${UNAME_MACHINE}-unknown-esx
 	exit ;;
+    amd64:Isilon\ OneFS:*:*)
+	echo x86_64-unknown-onefs
+	exit ;;
 esac
 
 cat >&2 <<EOF
@@ -1407,9 +1423,9 @@ This script, last modified $timestamp, has failed to recognize
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
diff --git a/config/autoconf/config.sub b/config/autoconf/config.sub
index afdef26..b01fff0 100755
--- a/config/autoconf/config.sub
+++ b/config/autoconf/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2015 Free Software Foundation, Inc.
+#   Copyright 1992-2016 Free Software Foundation, Inc.
 
-timestamp='2015-07-28'
+timestamp='2016-03-30'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ timestamp='2015-07-28'
 # Otherwise, we print the canonical config type on stdout and succeed.
 
 # You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
@@ -53,8 +53,7 @@ timestamp='2015-07-28'
 me=`echo "$0" | sed -e 's,.*/,,'`
 
 usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
+Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
 
 Canonicalize a configuration name.
 
@@ -68,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2015 Free Software Foundation, Inc.
+Copyright 1992-2016 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -306,7 +305,7 @@ case $basic_machine in
 	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -521,7 +520,7 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
-        asmjs)
+	asmjs)
 		basic_machine=asmjs-unknown
 		;;
 	aux)
@@ -1397,11 +1396,11 @@ case $os in
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* | -cloudabi* \
+	      | -aos* | -aros* | -cloudabi* | -sortix* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@@ -1417,7 +1416,8 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
+	      | -onefs* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1549,6 +1549,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
diff --git a/config/autoconf/ltmain.sh b/config/autoconf/ltmain.sh
index a48cb26..b2549ee 100644
--- a/config/autoconf/ltmain.sh
+++ b/config/autoconf/ltmain.sh
@@ -64,7 +64,7 @@ package_revision=2.4.6
 # libraries, which are installed to $pkgauxdir.
 
 # Set a version string for this script.
-scriptversion=2015-01-20.17; # UTC
+scriptversion=2015-10-04.22; # UTC
 
 # General shell script boiler plate, and helper functions.
 # Written by Gary V. Vaughan, 2004
@@ -1091,6 +1091,57 @@ func_relative_path ()
 }
 
 
+# func_quote ARG
+# --------------
+# Aesthetically quote one ARG, store the result into $func_quote_result.  Note
+# that we keep attention to performance here (so far O(N) complexity as long as
+# func_append is O(1)).
+func_quote ()
+{
+    $debug_cmd
+
+    func_quote_result=$1
+
+    case $func_quote_result in
+      *[\\\`\"\$]*)
+        case $func_quote_result in
+          *[\[\*\?]*)
+            func_quote_result=`$ECHO "$func_quote_result" | $SED "$sed_quote_subst"`
+            return 0
+            ;;
+        esac
+
+        func_quote_old_IFS=$IFS
+        for _G_char in '\' '`' '"' '$'
+        do
+          # STATE($1) PREV($2) SEPARATOR($3)
+          set start "" ""
+          func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy
+          IFS=$_G_char
+          for _G_part in $func_quote_result
+          do
+            case $1 in
+            quote)
+              func_append func_quote_result "$3$2"
+              set quote "$_G_part" "\\$_G_char"
+              ;;
+            start)
+              set first "" ""
+              func_quote_result=
+              ;;
+            first)
+              set quote "$_G_part" ""
+              ;;
+            esac
+          done
+          IFS=$func_quote_old_IFS
+        done
+        ;;
+      *) ;;
+    esac
+}
+
+
 # func_quote_for_eval ARG...
 # --------------------------
 # Aesthetically quote ARGs to be evaled later.
@@ -1107,12 +1158,8 @@ func_quote_for_eval ()
     func_quote_for_eval_unquoted_result=
     func_quote_for_eval_result=
     while test 0 -lt $#; do
-      case $1 in
-        *[\\\`\"\$]*)
-	  _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
-        *)
-          _G_unquoted_arg=$1 ;;
-      esac
+      func_quote "$1"
+      _G_unquoted_arg=$func_quote_result
       if test -n "$func_quote_for_eval_unquoted_result"; then
 	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
       else
@@ -5258,7 +5305,8 @@ else
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
     file=\"\$0\""
 
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    func_quote "$ECHO"
+    qECHO=$func_quote_result
     $ECHO "\
 
 # A function that is used when there is no print builtin or printf.
@@ -7272,12 +7320,14 @@ func_mode_link ()
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      # -fuse-ld=*           Linker select flags for GCC
+      # -specs=*             GCC specs files
       # -stdlib=*            select c++ std lib with clang
+      # -fsanitize=*         Clang/GCC memory and address sanitizer
+      # -fuse-ld=*           Linker select flags for GCC
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
-      -fuse-ld=*)
+      -specs=*|-fsanitize=*|-fuse-ld=*)
         func_quote_for_eval "$arg"
 	arg=$func_quote_for_eval_result
         func_append compile_command " $arg"
@@ -10508,8 +10558,8 @@ EOF
 	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
 	  fi
 	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+	func_quote "(cd `pwd`; $relink_command)"
+	relink_command=$func_quote_result
       fi
 
       # Only actually do things if not in dry run mode.
@@ -10755,7 +10805,8 @@ EOF
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
+      func_quote "$relink_command"
+      relink_command=$func_quote_result
       if test yes = "$hardcode_automatic"; then
 	relink_command=
       fi
diff --git a/configure b/configure
index 836ad8e..f9076a5 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mtrace-ng 0.5.
+# Generated by GNU Autoconf 2.69 for mtrace-ng 0.6.
 #
 # Report bugs to <stefani@seibold.net>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='mtrace-ng'
 PACKAGE_TARNAME='mtrace-ng'
-PACKAGE_VERSION='0.5'
-PACKAGE_STRING='mtrace-ng 0.5'
+PACKAGE_VERSION='0.6'
+PACKAGE_STRING='mtrace-ng 0.6'
 PACKAGE_BUGREPORT='stefani@seibold.net'
 PACKAGE_URL=''
 
@@ -1329,7 +1329,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 mtrace-ng 0.5 to adapt to many kinds of systems.
+\`configure' configures mtrace-ng 0.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1399,7 +1399,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of mtrace-ng 0.5:";;
+     short | recursive ) echo "Configuration of mtrace-ng 0.6:";;
    esac
   cat <<\_ACEOF
 
@@ -1518,7 +1518,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-mtrace-ng configure 0.5
+mtrace-ng configure 0.6
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2124,7 +2124,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 mtrace-ng $as_me 0.5, which was
+It was created by mtrace-ng $as_me 0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -12006,7 +12006,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mtrace-ng'
- VERSION='0.5'
+ VERSION='0.6'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13893,7 +13893,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 mtrace-ng $as_me 0.5, which was
+This file was extended by mtrace-ng $as_me 0.6, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13959,7 +13959,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="\\
-mtrace-ng config.status 0.5
+mtrace-ng config.status 0.6
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 792ae43..6af876c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.65)
 
-AC_INIT([mtrace-ng],[0.5],[stefani@seibold.net])
+AC_INIT([mtrace-ng],[0.6],[stefani@seibold.net])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR(main.c)
 AC_CONFIG_MACRO_DIR([config/m4])
diff --git a/options.c b/options.c
index b23b95c..a173d64 100644
--- a/options.c
+++ b/options.c
@@ -543,7 +543,7 @@ char **process_options(int argc, char **argv)
 			break;
 		case 'V':
 			printf("mtrace-ng version " PACKAGE_VERSION ".\n"
-			       "Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>.\n"
+			       "Copyright (C) 2016 Stefani Seibold <stefani@seibold.net>.\n"
 			       "\n"
 			       "This software was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.\n"
 			       "\n"