improved file structure for autotools

1 files changed, 217 insertions, 125 deletions

diff --git a/autom4te.cache/requests b/autom4te.cache/requests
index 3db21ee..8d2453e 100644
--- a/autom4te.cache/requests
+++ b/autom4te.cache/requests
@@ -30,50 +30,62 @@
                         '/usr/share/aclocal-1.16/strip.m4',
                         '/usr/share/aclocal-1.16/substnot.m4',
                         '/usr/share/aclocal-1.16/tar.m4',
+                        'm4/pkg.m4',
                         'configure.ac'
                       ],
                       {
-                        '_m4_warn' => 1,
-                        'AM_RUN_LOG' => 1,
-                        '_AM_SET_OPTIONS' => 1,
-                        '_AM_PROG_CC_C_O' => 1,
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AM_SUBST_NOTMAKE' => 1,
-                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AM_PROG_INSTALL_SH' => 1,
                         '_AM_SET_OPTION' => 1,
-                        '_AM_IF_OPTION' => 1,
-                        'm4_pattern_allow' => 1,
+                        'AU_DEFUN' => 1,
                         'AM_CONDITIONAL' => 1,
-                        '_AM_DEPENDENCIES' => 1,
-                        'AM_MISSING_HAS_RUN' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_RUN_LOG' => 1,
+                        'm4_include' => 1,
                         '_AM_CONFIG_MACRO_DIRS' => 1,
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'PKG_CHECK_MODULES' => 1,
+                        'AM_PROG_INSTALL_STRIP' => 1,
+                        'AM_MISSING_HAS_RUN' => 1,
+                        'AM_AUX_DIR_EXPAND' => 1,
+                        'PKG_CHECK_MODULES_STATIC' => 1,
                         'AM_SANITY_CHECK' => 1,
-                        'AM_SILENT_RULES' => 1,
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
+                        'PKG_HAVE_WITH_MODULES' => 1,
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'PKG_CHECK_VAR' => 1,
+                        'AM_MAKE_INCLUDE' => 1,
+                        '_AM_PROG_TAR' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'PKG_HAVE_DEFINE_WITH_MODULES' => 1,
+                        '_AM_SET_OPTIONS' => 1,
+                        'PKG_CHECK_EXISTS' => 1,
+                        '_m4_warn' => 1,
+                        '_PKG_SHORT_ERRORS_SUPPORTED' => 1,
+                        '_AM_MANGLE_OPTION' => 1,
                         'AC_DEFUN' => 1,
-                        'AC_CONFIG_MACRO_DIR' => 1,
+                        '_AM_DEPENDENCIES' => 1,
+                        'AM_MISSING_PROG' => 1,
                         'AC_CONFIG_MACRO_DIR_TRACE' => 1,
-                        'AU_DEFUN' => 1,
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AM_MAKE_INCLUDE' => 1,
+                        '_AM_PROG_CC_C_O' => 1,
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'include' => 1,
+                        'PKG_WITH_MODULES' => 1,
+                        'AC_CONFIG_MACRO_DIR' => 1,
+                        'PKG_PROG_PKG_CONFIG' => 1,
+                        'AM_SET_LEADING_DOT' => 1,
+                        'PKG_NOARCH_INSTALLDIR' => 1,
                         'AM_SET_DEPDIR' => 1,
-                        '_AM_MANGLE_OPTION' => 1,
-                        'AM_DEP_TRACK' => 1,
                         'AM_PROG_CC_C_O' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        '_AM_PROG_TAR' => 1,
-                        'include' => 1,
+                        'm4_pattern_allow' => 1,
+                        'AM_SILENT_RULES' => 1,
                         'AC_DEFUN_ONCE' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AM_SET_LEADING_DOT' => 1,
+                        'PKG_INSTALLDIR' => 1,
+                        'AM_SUBST_NOTMAKE' => 1,
+                        '_AM_IF_OPTION' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
-                        '_AM_AUTOCONF_VERSION' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AM_MISSING_PROG' => 1,
-                        'AM_PROG_INSTALL_SH' => 1,
-                        'm4_include' => 1,
-                        'AM_AUX_DIR_EXPAND' => 1
+                        'AM_DEP_TRACK' => 1,
+                        '_AM_AUTOCONF_VERSION' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -88,69 +100,69 @@
                         'configure.ac'
                       ],
                       {
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'GTK_DOC_CHECK' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_PROG_MKDIR_P' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
-                        'AM_GNU_GETTEXT' => 1,
-                        'AC_CANONICAL_HOST' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        '_m4_warn' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
                         'm4_pattern_allow' => 1,
-                        'AC_FC_PP_DEFINE' => 1,
-                        '_AM_COND_ENDIF' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
-                        'AC_SUBST' => 1,
-                        'AC_CONFIG_LINKS' => 1,
-                        'AM_PROG_FC_C_O' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AC_INIT' => 1,
                         'AC_FC_FREEFORM' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'LT_INIT' => 1,
                         'include' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'AC_INIT' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AM_PATH_GUILE' => 1,
-                        '_AM_COND_IF' => 1,
+                        'GTK_DOC_CHECK' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
-                        'AM_NLS' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
-                        'AM_MAKEFILE_INCLUDE' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'LT_INIT' => 1,
-                        'm4_include' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
                         'AC_FC_SRCEXT' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
                         'm4_sinclude' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'sinclude' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'm4_include' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
                         'AM_CONDITIONAL' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
-                        'AM_POT_TOOLS' => 1,
-                        'AM_SILENT_RULES' => 1,
-                        'AC_SUBST_TRACE' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_SUBST' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'IT_PROG_INTLTOOL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'sinclude' => 1,
-                        'AH_OUTPUT' => 1,
+                        'AM_NLS' => 1,
+                        '_m4_warn' => 1,
+                        'm4_pattern_forbid' => 1,
                         'AM_PROG_AR' => 1,
-                        'AM_PROG_MOC' => 1
+                        'AM_PROG_CXX_C_O' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
+                        'AM_POT_TOOLS' => 1
                       }
                     ], 'Autom4te::Request' ),
              bless( [
@@ -166,69 +178,149 @@
                         'configure.ac'
                       ],
                       {
-                        'AC_CANONICAL_HOST' => 1,
-                        'AM_GNU_GETTEXT' => 1,
                         'AM_PROG_LIBTOOL' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
-                        'AM_PROG_MKDIR_P' => 1,
-                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        'AM_AUTOMAKE_VERSION' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'GTK_DOC_CHECK' => 1,
-                        'AC_CONFIG_FILES' => 1,
-                        'LT_SUPPORTED_TAG' => 1,
-                        '_LT_AC_TAGCONFIG' => 1,
-                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AC_LIBSOURCE' => 1,
+                        'm4_include' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_CONDITIONAL' => 1,
+                        'AC_SUBST' => 1,
+                        '_AM_COND_ELSE' => 1,
                         '_AM_COND_ENDIF' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_PROG_F77_C_O' => 1,
+                        'AM_NLS' => 1,
+                        '_m4_warn' => 1,
                         'AC_CANONICAL_TARGET' => 1,
+                        'AC_CONFIG_HEADERS' => 1,
+                        'IT_PROG_INTLTOOL' => 1,
+                        'AM_PROG_AR' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AM_POT_TOOLS' => 1,
                         'AC_FC_PP_DEFINE' => 1,
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
                         'm4_pattern_allow' => 1,
-                        '_m4_warn' => 1,
+                        'AM_MAKEFILE_INCLUDE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AM_PATH_GUILE' => 1,
+                        'AC_INIT' => 1,
+                        'AM_GNU_GETTEXT' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_FC_FREEFORM' => 1,
-                        'AM_PROG_FC_C_O' => 1,
-                        'AC_SUBST' => 1,
+                        'include' => 1,
+                        'LT_INIT' => 1,
+                        'GTK_DOC_CHECK' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_CONFIG_FILES' => 1,
                         'AC_CONFIG_LINKS' => 1,
-                        '_AM_SUBST_NOTMAKE' => 1,
-                        '_AM_COND_ELSE' => 1,
-                        'AC_INIT' => 1,
-                        'AC_FC_PP_SRCEXT' => 1,
-                        'AM_XGETTEXT_OPTION' => 1,
-                        'AM_PATH_GUILE' => 1,
                         'AC_CANONICAL_SYSTEM' => 1,
-                        '_AM_COND_IF' => 1,
-                        'AM_NLS' => 1,
-                        'include' => 1,
-                        'AM_PROG_CXX_C_O' => 1,
-                        'm4_pattern_forbid' => 1,
-                        'm4_include' => 1,
+                        'AH_OUTPUT' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
                         'AC_FC_SRCEXT' => 1,
-                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
+                        'AC_SUBST_TRACE' => 1,
+                        'm4_sinclude' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AM_SILENT_RULES' => 1,
+                        'sinclude' => 1,
+                        'AM_PROG_MOC' => 1
+                      }
+                    ], 'Autom4te::Request' ),
+             bless( [
+                      '3',
+                      1,
+                      [
+                        '/usr/share/autoconf'
+                      ],
+                      [
+                        '/usr/share/autoconf/m4sugar/m4sugar.m4',
+                        '/usr/share/autoconf/m4sugar/m4sh.m4',
+                        '/usr/share/autoconf/autoconf/autoconf.m4',
+                        'aclocal.m4',
+                        '/usr/share/autoconf/autoconf/trailer.m4',
+                        'configure.ac'
+                      ],
+                      {
                         'LT_INIT' => 1,
-                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'include' => 1,
+                        'GTK_DOC_CHECK' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AM_GNU_GETTEXT' => 1,
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_FC_FREEFORM' => 1,
+                        'AC_INIT' => 1,
+                        '_AM_MAKEFILE_INCLUDE' => 1,
+                        'm4_pattern_allow' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
-                        'AM_PROG_F77_C_O' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
-                        'AM_INIT_AUTOMAKE' => 1,
+                        'AM_PROG_CC_C_O' => 1,
+                        'LT_SUPPORTED_TAG' => 1,
+                        'AM_PROG_MKDIR_P' => 1,
+                        'AC_REQUIRE_AUX_FILE' => 1,
+                        'AM_PATH_GUILE' => 1,
                         'AM_SILENT_RULES' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
+                        'AM_PROG_MOC' => 1,
+                        'sinclude' => 1,
+                        'AC_CANONICAL_HOST' => 1,
+                        'AM_ENABLE_MULTILIB' => 1,
+                        'AM_PROG_FC_C_O' => 1,
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
                         'AC_SUBST_TRACE' => 1,
-                        'AM_POT_TOOLS' => 1,
+                        'm4_sinclude' => 1,
+                        'AC_PROG_LIBTOOL' => 1,
+                        'AC_FC_SRCEXT' => 1,
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
+                        'AM_AUTOMAKE_VERSION' => 1,
+                        'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
+                        'AC_CONFIG_FILES' => 1,
+                        'AC_CONFIG_LINKS' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AH_OUTPUT' => 1,
                         'AC_CANONICAL_BUILD' => 1,
+                        '_AM_SUBST_NOTMAKE' => 1,
+                        '_AM_COND_ELSE' => 1,
+                        '_AM_COND_ENDIF' => 1,
+                        'AC_FC_PP_SRCEXT' => 1,
                         'AM_CONDITIONAL' => 1,
+                        'AM_INIT_AUTOMAKE' => 1,
+                        'AC_SUBST' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'm4_sinclude' => 1,
-                        'AM_MAINTAINER_MODE' => 1,
-                        'AM_PROG_MOC' => 1,
-                        'AH_OUTPUT' => 1,
+                        'm4_include' => 1,
+                        'LT_CONFIG_LTDL_DIR' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
+                        '_AM_COND_IF' => 1,
+                        'AM_XGETTEXT_OPTION' => 1,
+                        'AM_POT_TOOLS' => 1,
+                        'AC_FC_PP_DEFINE' => 1,
                         'AM_PROG_AR' => 1,
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
+                        'AM_PROG_CXX_C_O' => 1,
+                        'm4_pattern_forbid' => 1,
+                        'AM_NLS' => 1,
+                        '_m4_warn' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'IT_PROG_INTLTOOL' => 1,
-                        '_AM_MAKEFILE_INCLUDE' => 1,
-                        'sinclude' => 1,
-                        'AM_ENABLE_MULTILIB' => 1,
-                        'AC_CONFIG_HEADERS' => 1
+                        'AC_CONFIG_HEADERS' => 1,
+                        'AM_MAINTAINER_MODE' => 1,
+                        'AM_PROG_F77_C_O' => 1
                       }
                     ], 'Autom4te::Request' )
            );