diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index ddb56b8..ab6bbff 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -42,186 +42,186 @@
                         'configure.ac'
                       ],
                       {
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        'AC_PROG_LD' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        'LT_FUNC_ARGZ' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        'AC_PROG_NM' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'LT_PROG_GO' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        '_m4_warn' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        'LT_SYS_MODULE_PATH' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'LT_PATH_LD' => 1,
-                        'LT_CMD_MAX_LEN' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AM_ENABLE_STATIC' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        '_LT_PROG_F77' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        '_LTDL_SETUP' => 1,
-                        '_AM_SET_OPTION' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
-                        'include' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AM_ENABLE_SHARED' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        '_LT_AC_LOCK' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'LT_PATH_NM' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AC_DISABLE_STATIC' => 1,
                         'LT_AC_PROG_RC' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'LTDL_INIT' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'm4_pattern_allow' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
                         'AM_SUBST_NOTMAKE' => 1,
-                        'LT_LIB_M' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AC_DEFUN' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'AC_CHECK_LIBM' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
                         '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        'LT_PROG_RC' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AU_DEFUN' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
-                        'LT_WITH_LTDL' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
                         'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'LT_INIT' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'm4_pattern_forbid' => 1,
+                        'LT_LIB_M' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_PATH_MAGIC' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
                         'AC_LIBTOOL_PICMODE' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'm4_include' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AU_DEFUN' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        'AM_PROG_NM' => 1,
+                        'LTDL_INSTALLABLE' => 1,
                         'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'LT_PROG_GO' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        '_m4_warn' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'LT_INIT' => 1,
+                        'LT_FUNC_ARGZ' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'include' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'm4_include' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'LT_SYS_MODULE_PATH' => 1,
+                        'LT_CMD_MAX_LEN' => 1,
+                        'm4_pattern_forbid' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
                         'AM_PROG_LD' => 1,
-                        'LT_OUTPUT' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'LT_LANG' => 1
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_AM_SET_OPTION' => 1,
+                        'LT_PROG_RC' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_ENABLE_STATIC' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_DEFUN' => 1,
+                        'LT_AC_PROG_SED' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'LT_LANG' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        'AC_PROG_LD' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        '_LT_PROG_F77' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -263,186 +263,186 @@
                         'configure.ac'
                       ],
                       {
-                        '_LT_AC_LOCK' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
-                        'LT_PATH_NM' => 1,
-                        'LTOBSOLETE_VERSION' => 1,
-                        'AM_SET_DEPDIR' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_DISABLE_STATIC' => 1,
-                        'AM_DEP_TRACK' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'LT_AC_PROG_RC' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        '_LT_AC_LANG_CXX' => 1,
-                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AC_LIBTOOL_SETUP' => 1,
                         '_LT_AC_TRY_DLOPEN_SELF' => 1,
-                        'LTOPTIONS_VERSION' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'LTDL_INIT' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        '_LT_AC_TAGVAR' => 1,
-                        'AC_LTDL_PREOPEN' => 1,
-                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
-                        '_LT_AC_CHECK_DLFCN' => 1,
-                        '_LT_DLL_DEF_P' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'm4_pattern_allow' => 1,
-                        '_LT_CC_BASENAME' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_LTDL_DLLIB' => 1,
-                        'LT_LIB_DLLOAD' => 1,
-                        '_LT_AC_LANG_CXX_CONFIG' => 1,
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
-                        'LT_AC_PROG_GCJ' => 1,
-                        'AC_ENABLE_STATIC' => 1,
-                        'AC_WITH_LTDL' => 1,
-                        'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
-                        'AC_LTDL_OBJDIR' => 1,
-                        'AC_LIBTOOL_F77' => 1,
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
-                        '_LT_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'AC_DEFUN' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        'AM_SANITY_CHECK' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'LT_LIB_M' => 1,
-                        'AC_PROG_LD_GNU' => 1,
-                        'AC_LTDL_SHLIBEXT' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
-                        'LT_SYS_SYMBOL_USCORE' => 1,
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
-                        'AC_CHECK_LIBM' => 1,
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
-                        '_LT_PROG_FC' => 1,
-                        'AC_DISABLE_SHARED' => 1,
-                        'LT_PROG_RC' => 1,
-                        'LT_SYS_MODULE_EXT' => 1,
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        'AC_PATH_MAGIC' => 1,
                         'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
-                        'LT_WITH_LTDL' => 1,
-                        'AM_DISABLE_STATIC' => 1,
-                        'AU_DEFUN' => 1,
-                        'AC_ENABLE_SHARED' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'LT_INIT' => 1,
-                        'AC_LIBTOOL_GCJ' => 1,
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
-                        'AC_PATH_TOOL_PREFIX' => 1,
-                        'AC_LTDL_SHLIBPATH' => 1,
-                        'm4_include' => 1,
-                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'LT_LIB_M' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
+                        'LT_AC_PROG_RC' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        'AC_LTDL_PREOPEN' => 1,
                         'AC_LIBTOOL_PROG_CC_C_O' => 1,
+                        'LT_SYS_DLSEARCH_PATH' => 1,
+                        'AC_LTDL_DLSYM_USCORE' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        '_LT_AC_LANG_F77' => 1,
+                        'AM_ENABLE_SHARED' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
+                        'AM_PROG_NM' => 1,
+                        'LTDL_INSTALLABLE' => 1,
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
+                        'AU_DEFUN' => 1,
+                        '_LT_PATH_TOOL_PREFIX' => 1,
+                        'AC_LTDL_DLLIB' => 1,
+                        '_LT_AC_LOCK' => 1,
+                        '_LT_AC_LANG_CXX' => 1,
+                        'LTOPTIONS_VERSION' => 1,
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
+                        '_LT_LINKER_BOILERPLATE' => 1,
+                        'AM_DISABLE_SHARED' => 1,
+                        'AM_MISSING_PROG' => 1,
+                        'LT_PROG_GO' => 1,
+                        'LT_AC_PROG_EGREP' => 1,
+                        '_m4_warn' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'LT_WITH_LTDL' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1,
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
+                        '_LT_AC_LANG_CXX_CONFIG' => 1,
+                        'LT_LIB_DLLOAD' => 1,
+                        'AC_LIBTOOL_CONFIG' => 1,
+                        '_LTDL_SETUP' => 1,
+                        'LTSUGAR_VERSION' => 1,
+                        'LT_FUNC_DLSYM_USCORE' => 1,
+                        'AM_ENABLE_STATIC' => 1,
+                        '_LT_WITH_SYSROOT' => 1,
+                        '_LT_AC_SHELL_INIT' => 1,
+                        'LT_OUTPUT' => 1,
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AC_LTDL_SHLIBPATH' => 1,
+                        '_LT_AC_TAGVAR' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'AC_LIBTOOL_OBJDIR' => 1,
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
+                        '_LT_COMPILER_BOILERPLATE' => 1,
+                        'AC_DISABLE_SHARED' => 1,
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
+                        'AC_PROG_EGREP' => 1,
+                        'AC_LIBTOOL_FC' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_ENABLE_SHARED' => 1,
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'AC_LIBTOOL_CXX' => 1,
+                        'LT_SYS_MODULE_EXT' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'LTOBSOLETE_VERSION' => 1,
+                        'LT_FUNC_ARGZ' => 1,
+                        'LT_INIT' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
+                        'AC_LIBTOOL_GCJ' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'AM_DISABLE_STATIC' => 1,
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
+                        'LT_SYS_DLOPEN_SELF' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
+                        'AC_PATH_TOOL_PREFIX' => 1,
+                        '_LT_PROG_LTMAIN' => 1,
+                        'AC_LTDL_OBJDIR' => 1,
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
+                        '_LT_CC_BASENAME' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'AC_DEPLIBS_CHECK_METHOD' => 1,
+                        'm4_include' => 1,
+                        'LT_PATH_LD' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        '_LT_AC_CHECK_DLFCN' => 1,
+                        'AM_SANITY_CHECK' => 1,
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_LIBTOOL_RC' => 1,
+                        'AC_LIBTOOL_F77' => 1,
+                        '_LT_AC_PROG_CXXCPP' => 1,
+                        '_LT_PROG_FC' => 1,
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
+                        '_AC_PROG_LIBTOOL' => 1,
+                        'LT_PATH_NM' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'include' => 1,
+                        'AC_DISABLE_STATIC' => 1,
+                        'AM_SET_DEPDIR' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'LT_PROG_GCJ' => 1,
+                        'AC_LTDL_SHLIBEXT' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
+                        'AC_LIBTOOL_DLOPEN' => 1,
+                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
                         'AM_PROG_LD' => 1,
-                        'LT_SYS_DLOPEN_SELF' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'LT_OUTPUT' => 1,
-                        'LT_LANG' => 1,
-                        'LT_SYS_DLSEARCH_PATH' => 1,
-                        '_LT_AC_LANG_GCJ' => 1,
-                        'AC_PROG_LD' => 1,
-                        'LT_FUNC_DLSYM_USCORE' => 1,
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        'AM_RUN_LOG' => 1,
-                        'LTSUGAR_VERSION' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_SETUP' => 1,
-                        '_LT_LINKER_BOILERPLATE' => 1,
-                        'LT_FUNC_ARGZ' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_PROG_NM' => 1,
-                        'AC_LIBTOOL_FC' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
-                        'LT_AC_PROG_SED' => 1,
-                        'AC_LIB_LTDL' => 1,
-                        'AC_ENABLE_FAST_INSTALL' => 1,
-                        '_LT_AC_LANG_C_CONFIG' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        'LTDL_INSTALLABLE' => 1,
-                        '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LTDL_DLSYM_USCORE' => 1,
-                        '_LT_AC_SYS_COMPILER' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
-                        'LTDL_CONVENIENCE' => 1,
-                        '_LT_COMPILER_BOILERPLATE' => 1,
-                        'LT_AC_PROG_EGREP' => 1,
-                        'AC_PROG_NM' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'LT_PROG_GO' => 1,
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
-                        'AC_LIBTOOL_RC' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        '_LT_WITH_SYSROOT' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        '_m4_warn' => 1,
-                        '_LT_LIBOBJ' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        '_LT_AC_SHELL_INIT' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
-                        'LT_PROG_GCJ' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AC_PROG_EGREP' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
-                        '_LT_LINKER_OPTION' => 1,
-                        '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
-                        '_LT_AC_LANG_F77' => 1,
-                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
                         'LT_SYS_MODULE_PATH' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
-                        'LT_PATH_LD' => 1,
-                        'AC_PATH_MAGIC' => 1,
-                        'AM_ENABLE_STATIC' => 1,
                         'LT_CMD_MAX_LEN' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
-                        'AM_DISABLE_SHARED' => 1,
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
-                        '_LT_PROG_F77' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        '_LT_AC_PROG_CXXCPP' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
-                        'AC_DEFUN_ONCE' => 1,
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
-                        '_LT_PROG_LTMAIN' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'LTDL_INIT' => 1,
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        'LTDL_CONVENIENCE' => 1,
+                        'AC_LIB_LTDL' => 1,
+                        'AC_PROG_NM' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         '_AM_SET_OPTION' => 1,
-                        '_LTDL_SETUP' => 1,
-                        '_AC_PROG_LIBTOOL' => 1,
-                        'include' => 1,
-                        'AC_LIBTOOL_CXX' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
+                        'LT_PROG_RC' => 1,
                         'AM_CONDITIONAL' => 1,
-                        'AM_ENABLE_SHARED' => 1
+                        'AC_ENABLE_STATIC' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
+                        'AC_ENABLE_FAST_INSTALL' => 1,
+                        'LT_AC_PROG_GCJ' => 1,
+                        '_LT_AC_LANG_F77_CONFIG' => 1,
+                        '_LT_DLL_DEF_P' => 1,
+                        '_LT_AC_SYS_COMPILER' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
+                        'LT_LANG' => 1,
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_PROG_LD' => 1,
+                        '_LT_PROG_ECHO_BACKSLASH' => 1,
+                        '_LT_PROG_F77' => 1,
+                        'AM_DEP_TRACK' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'LTVERSION_VERSION' => 1,
+                        'AC_PROG_LD_GNU' => 1,
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_CHECK_LIBM' => 1,
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_WITH_LTDL' => 1,
+                        '_LT_AC_LANG_GCJ' => 1,
+                        'AC_DEFUN_ONCE' => 1,
+                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        '_LT_AC_LANG_C_CONFIG' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'LT_SYS_SYMBOL_USCORE' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
+                        '_LT_LINKER_OPTION' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
+                        '_LT_LIBOBJ' => 1,
+                        'AC_DEFUN' => 1,
+                        'LT_AC_PROG_SED' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -457,65 +457,65 @@
                         'configure.ac'
                       ],
                       {
-                        'sinclude' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        '_m4_warn' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AC_SUBST' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_CONFIG_LINKS' => 1,
                         '_AM_COND_IF' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AC_INIT' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AC_FC_SRCEXT' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'LT_INIT' => 1,
+                        'AM_PROG_AR' => 1,
                         'AC_CONFIG_HEADERS' => 1,
-                        'm4_sinclude' => 1,
-                        'AH_OUTPUT' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'm4_include' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'm4_pattern_allow' => 1,
-                        'AC_LIBSOURCE' => 1,
-                        'AM_NLS' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AC_FC_FREEFORM' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AM_PROG_FC_C_O' => 1,
                         'AC_SUBST_TRACE' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'LT_INIT' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'm4_sinclude' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_SUBST' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
+                        '_m4_warn' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AM_NLS' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'm4_include' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'sinclude' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AC_INIT' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
                         'include' => 1,
-                        'AM_PROG_AR' => 1
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AC_LIBSOURCE' => 1
                       }
                     ], 'Autom4te::Request' )
            );
diff --git a/backend.h b/backend.h
index 5efaeb4..3291303 100644
--- a/backend.h
+++ b/backend.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/backtrace.h b/backtrace.h
index bdbf9f0..298a7d4 100644
--- a/backtrace.h
+++ b/backtrace.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/breakpoint.c b/breakpoint.c
index 4baf3fd..883f846 100644
--- a/breakpoint.c
+++ b/breakpoint.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/breakpoint.h b/breakpoint.h
index cc0c0ac..d918d43 100644
--- a/breakpoint.h
+++ b/breakpoint.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/bfdinc.h b/client/bfdinc.h
index 321d883..b517c26 100644
--- a/client/bfdinc.h
+++ b/client/bfdinc.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/binfile.c b/client/binfile.c
index b92802b..94e216d 100644
--- a/client/binfile.c
+++ b/client/binfile.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/binfile.h b/client/binfile.h
index 91819cc..df680bb 100644
--- a/client/binfile.h
+++ b/client/binfile.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/client.c b/client/client.c
index 532b371..841f91b 100644
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/client.h b/client/client.h
index 16822fb..e6dbd05 100644
--- a/client/client.h
+++ b/client/client.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/dump.c b/client/dump.c
index 20623d1..8eaf451 100644
--- a/client/dump.c
+++ b/client/dump.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/dump.h b/client/dump.h
index ddcf357..1b6fa8f 100644
--- a/client/dump.h
+++ b/client/dump.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/job.c b/client/job.c
index 6368561..6b2756a 100644
--- a/client/job.c
+++ b/client/job.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/job.h b/client/job.h
index 23cfbdc..29fdb69 100644
--- a/client/job.h
+++ b/client/job.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/process.c b/client/process.c
index 3325213..688dbd3 100644
--- a/client/process.c
+++ b/client/process.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/process.h b/client/process.h
index da79f28..c2bb5e2 100644
--- a/client/process.h
+++ b/client/process.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/readline.c b/client/readline.c
index 2e758e7..5e3bf2c 100644
--- a/client/readline.c
+++ b/client/readline.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/client/readline.h b/client/readline.h
index 0db6ddf..a74c4b9 100644
--- a/client/readline.h
+++ b/client/readline.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/common.c b/common.c
index ed5064a..e900706 100644
--- a/common.c
+++ b/common.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/common.h b/common.h
index 1618839..7964aca 100644
--- a/common.h
+++ b/common.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/debug.c b/debug.c
index 467f6ce..7f2b77a 100644
--- a/debug.c
+++ b/debug.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/debug.h b/debug.h
index 08cb08e..6bbc1ed 100644
--- a/debug.h
+++ b/debug.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/dict.c b/dict.c
index 1c48029..225e86f 100644
--- a/dict.c
+++ b/dict.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/dict.h b/dict.h
index f6452a3..830ce5c 100644
--- a/dict.h
+++ b/dict.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/dwarf.c b/dwarf.c
index 2280e4d..35a9a0b 100644
--- a/dwarf.c
+++ b/dwarf.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the libunwind source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/dwarf.h b/dwarf.h
index b35a2e5..d57b411 100644
--- a/dwarf.h
+++ b/dwarf.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the libunwind source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/event.c b/event.c
index 716812a..492aa3d 100644
--- a/event.c
+++ b/event.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/event.h b/event.h
index 0c5b6e7..0673215 100644
--- a/event.h
+++ b/event.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/forward.h b/forward.h
index da0d39a..8cee44b 100644
--- a/forward.h
+++ b/forward.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/library.c b/library.c
index 112e315..4581b66 100644
--- a/library.c
+++ b/library.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/library.h b/library.h
index 71ca46e..88d3c99 100644
--- a/library.h
+++ b/library.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/main.c b/main.c
index afc25ba..b0649e8 100644
--- a/main.c
+++ b/main.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/main.h b/main.h
index 0423b0e..3c1698b 100644
--- a/main.h
+++ b/main.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/memtrace.h b/memtrace.h
index 77eca3b..d78d91d 100644
--- a/memtrace.h
+++ b/memtrace.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/mtelf.c b/mtelf.c
index 3cd4e80..fc12e1e 100644
--- a/mtelf.c
+++ b/mtelf.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/mtelf.h b/mtelf.h
index bc13850..c636bb8 100644
--- a/mtelf.h
+++ b/mtelf.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/mtrace.h b/mtrace.h
index 98728ee..d006160 100644
--- a/mtrace.h
+++ b/mtrace.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/options.c b/options.c
index 23b3a13..6a06912 100644
--- a/options.c
+++ b/options.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -408,7 +408,7 @@ char **process_options(int argc, char **argv)
 			printf("mtrace version " PACKAGE_VERSION ".\n"
 			       "Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>.\n"
 			       "\n"
-			       "This software was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.\n"
+			       "This software was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.\n"
 			       "\n"
 			       "This is free software; see the GNU General Public Licence\n"
 			       "version 2 or later for copying conditions. There is NO warranty.\n");
diff --git a/options.h b/options.h
index 3355ff0..e61a7fe 100644
--- a/options.h
+++ b/options.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/report.c b/report.c
index 8a552e4..7132354 100644
--- a/report.c
+++ b/report.c
@@ -4,7 +4,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/report.h b/report.h
index 1ff555d..13094c5 100644
--- a/report.h
+++ b/report.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/server.c b/server.c
index 2a3134d..ea60a59 100644
--- a/server.c
+++ b/server.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/server.h b/server.h
index 5da7222..33f8e34 100644
--- a/server.h
+++ b/server.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/arm/arch.c b/sysdeps/linux-gnu/arm/arch.c
index ed10a05..57ca199 100644
--- a/sysdeps/linux-gnu/arm/arch.c
+++ b/sysdeps/linux-gnu/arm/arch.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/arm/arch.h b/sysdeps/linux-gnu/arm/arch.h
index cc3ac49..98182c4 100644
--- a/sysdeps/linux-gnu/arm/arch.h
+++ b/sysdeps/linux-gnu/arm/arch.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/arm/dwarf-arm.c b/sysdeps/linux-gnu/arm/dwarf-arm.c
index 5d58690..9e40b30 100644
--- a/sysdeps/linux-gnu/arm/dwarf-arm.c
+++ b/sysdeps/linux-gnu/arm/dwarf-arm.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/arm/regs.c b/sysdeps/linux-gnu/arm/regs.c
index 8dff191..ab713a5 100644
--- a/sysdeps/linux-gnu/arm/regs.c
+++ b/sysdeps/linux-gnu/arm/regs.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/backtrace.c b/sysdeps/linux-gnu/backtrace.c
index d017a0c..d3da710 100644
--- a/sysdeps/linux-gnu/backtrace.c
+++ b/sysdeps/linux-gnu/backtrace.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/ioevent.c b/sysdeps/linux-gnu/ioevent.c
index 8c98d80..c7ce9ea 100644
--- a/sysdeps/linux-gnu/ioevent.c
+++ b/sysdeps/linux-gnu/ioevent.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/ioevent.h b/sysdeps/linux-gnu/ioevent.h
index 813244d..852f174 100644
--- a/sysdeps/linux-gnu/ioevent.h
+++ b/sysdeps/linux-gnu/ioevent.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/os.c b/sysdeps/linux-gnu/os.c
index 6949533..678b8ea 100644
--- a/sysdeps/linux-gnu/os.c
+++ b/sysdeps/linux-gnu/os.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/os.h b/sysdeps/linux-gnu/os.h
index f6becaa..d63e8cf 100644
--- a/sysdeps/linux-gnu/os.h
+++ b/sysdeps/linux-gnu/os.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/ppc/arch.c b/sysdeps/linux-gnu/ppc/arch.c
index 61e97a9..fc30cc9 100644
--- a/sysdeps/linux-gnu/ppc/arch.c
+++ b/sysdeps/linux-gnu/ppc/arch.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/ppc/arch.h b/sysdeps/linux-gnu/ppc/arch.h
index 93ab6f3..b1ee7ad 100644
--- a/sysdeps/linux-gnu/ppc/arch.h
+++ b/sysdeps/linux-gnu/ppc/arch.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/ppc/dwarf-ppc.c b/sysdeps/linux-gnu/ppc/dwarf-ppc.c
index 77d5e69..b9f010c 100644
--- a/sysdeps/linux-gnu/ppc/dwarf-ppc.c
+++ b/sysdeps/linux-gnu/ppc/dwarf-ppc.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/ppc/regs.c b/sysdeps/linux-gnu/ppc/regs.c
index 83ae609..6df3ea5 100644
--- a/sysdeps/linux-gnu/ppc/regs.c
+++ b/sysdeps/linux-gnu/ppc/regs.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c
index ff3c59a..049a3a5 100644
--- a/sysdeps/linux-gnu/proc.c
+++ b/sysdeps/linux-gnu/proc.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/socket.c b/sysdeps/linux-gnu/socket.c
index ed2c2de..4e859c7 100644
--- a/sysdeps/linux-gnu/socket.c
+++ b/sysdeps/linux-gnu/socket.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/socket.h b/sysdeps/linux-gnu/socket.h
index b017bbf..d16e595 100644
--- a/sysdeps/linux-gnu/socket.h
+++ b/sysdeps/linux-gnu/socket.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/thread.c b/sysdeps/linux-gnu/thread.c
index abf016a..5353c3c 100644
--- a/sysdeps/linux-gnu/thread.c
+++ b/sysdeps/linux-gnu/thread.c
@@ -4,7 +4,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/trace.c b/sysdeps/linux-gnu/trace.c
index 7755724..292af11 100644
--- a/sysdeps/linux-gnu/trace.c
+++ b/sysdeps/linux-gnu/trace.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/x86/arch.c b/sysdeps/linux-gnu/x86/arch.c
index b880f95..4034a5e 100644
--- a/sysdeps/linux-gnu/x86/arch.c
+++ b/sysdeps/linux-gnu/x86/arch.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/x86/arch.h b/sysdeps/linux-gnu/x86/arch.h
index 7dc0358..a7e0034 100644
--- a/sysdeps/linux-gnu/x86/arch.h
+++ b/sysdeps/linux-gnu/x86/arch.h
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/x86/dwarf-x86.c b/sysdeps/linux-gnu/x86/dwarf-x86.c
index 0caa544..a5ae480 100644
--- a/sysdeps/linux-gnu/x86/dwarf-x86.c
+++ b/sysdeps/linux-gnu/x86/dwarf-x86.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/linux-gnu/x86/regs.c b/sysdeps/linux-gnu/x86/regs.c
index be40fba..bf0a9a1 100644
--- a/sysdeps/linux-gnu/x86/regs.c
+++ b/sysdeps/linux-gnu/x86/regs.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/sysdeps/sysdep.h b/sysdeps/sysdep.h
index b07e8a6..d38916a 100644
--- a/sysdeps/sysdep.h
+++ b/sysdeps/sysdep.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/task.c b/task.c
index 768b561..436def6 100644
--- a/task.c
+++ b/task.c
@@ -3,7 +3,7 @@
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *  This file is based on the ltrace source
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/task.h b/task.h
index 7a6ba88..f03d253 100644
--- a/task.h
+++ b/task.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/thread.h b/thread.h
index 4207527..1004a8c 100644
--- a/thread.h
+++ b/thread.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/trace.c b/trace.c
index 3467eb1..11143bf 100644
--- a/trace.c
+++ b/trace.c
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/trace.h b/trace.h
index ab14d0e..0a1eb6c 100644
--- a/trace.h
+++ b/trace.h
@@ -2,7 +2,7 @@
  * This file is part of mtrace.
  * Copyright (C) 2015 Stefani Seibold <stefani@seibold.net>
  *
- * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich.
+ * This work was sponsored by Rohde & Schwarz GmbH & Co. KG, Munich/Germany.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as