update makefile

2 files changed, 127 insertions, 116 deletions

diff --git a/libgpython/Makefile.in b/libgpython/Makefile.in
index 1c1b597a0ce..265d0900cea 100644
--- a/libgpython/Makefile.in
+++ b/libgpython/Makefile.in
@@ -81,11 +81,13 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(library_includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libgpython_la_LIBADD =
-am_libgpython_la_OBJECTS = libgpython_la-obj-class.lo \
-	libgpython_la-obj-functor.lo libgpython_la-obj-integer.lo \
-	libgpython_la-obj-list.lo libgpython_la-py-main.lo \
-	libgpython_la-py-runtime.lo libgpython_la-py-type-utils.lo \
-	libgpython_la-py-routines.lo libgpython_la-py-vectors.lo
+am_libgpython_la_OBJECTS = libgpython_la-py-obj_class.lo \
+	libgpython_la-py-obj_staticmethod.lo \
+	libgpython_la-py-obj_classmethod.lo \
+	libgpython_la-py-obj_integer.lo libgpython_la-py-obj_list.lo \
+	libgpython_la-py-main.lo libgpython_la-py-runtime.lo \
+	libgpython_la-py-type-utils.lo libgpython_la-py-routines.lo \
+	libgpython_la-py-vectors.lo
 libgpython_la_OBJECTS = $(am_libgpython_la_OBJECTS)
 libgpython_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgpython_la_CFLAGS) \
@@ -268,13 +270,14 @@ include/gpython/runtime.h \
 include/gpython/vectors.h \
 include/gpython/objects.h
 
-libgpython_la_CFLAGS = -DPYHON -DSHARED
+libgpython_la_CFLAGS = -DGPYHON -DSHARED
 libgpython_la_LDFLAGS = -release 0.0.1
 libgpython_la_SOURCES = \
-runtime/obj-class.c \
-runtime/obj-functor.c \
-runtime/obj-integer.c \
-runtime/obj-list.c \
+runtime/py-obj_class.c \
+runtime/py-obj_staticmethod.c \
+runtime/py-obj_classmethod.c \
+runtime/py-obj_integer.c \
+runtime/py-obj_list.c \
 runtime/py-main.c \
 runtime/py-runtime.c \
 runtime/py-type-utils.c \
@@ -377,11 +380,12 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-obj-class.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-obj-functor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-obj-integer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-obj-list.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-py-main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-py-obj_class.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-py-obj_classmethod.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-py-obj_integer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-py-obj_list.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-py-obj_staticmethod.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-py-routines.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-py-runtime.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgpython_la-py-type-utils.Plo@am__quote@
@@ -408,33 +412,40 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
-libgpython_la-obj-class.lo: runtime/obj-class.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-obj-class.lo -MD -MP -MF $(DEPDIR)/libgpython_la-obj-class.Tpo -c -o libgpython_la-obj-class.lo `test -f 'runtime/obj-class.c' || echo '$(srcdir)/'`runtime/obj-class.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libgpython_la-obj-class.Tpo $(DEPDIR)/libgpython_la-obj-class.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/obj-class.c' object='libgpython_la-obj-class.lo' libtool=yes @AMDEPBACKSLASH@
+libgpython_la-py-obj_class.lo: runtime/py-obj_class.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-py-obj_class.lo -MD -MP -MF $(DEPDIR)/libgpython_la-py-obj_class.Tpo -c -o libgpython_la-py-obj_class.lo `test -f 'runtime/py-obj_class.c' || echo '$(srcdir)/'`runtime/py-obj_class.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libgpython_la-py-obj_class.Tpo $(DEPDIR)/libgpython_la-py-obj_class.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/py-obj_class.c' object='libgpython_la-py-obj_class.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -c -o libgpython_la-obj-class.lo `test -f 'runtime/obj-class.c' || echo '$(srcdir)/'`runtime/obj-class.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -c -o libgpython_la-py-obj_class.lo `test -f 'runtime/py-obj_class.c' || echo '$(srcdir)/'`runtime/py-obj_class.c
 
-libgpython_la-obj-functor.lo: runtime/obj-functor.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-obj-functor.lo -MD -MP -MF $(DEPDIR)/libgpython_la-obj-functor.Tpo -c -o libgpython_la-obj-functor.lo `test -f 'runtime/obj-functor.c' || echo '$(srcdir)/'`runtime/obj-functor.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libgpython_la-obj-functor.Tpo $(DEPDIR)/libgpython_la-obj-functor.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/obj-functor.c' object='libgpython_la-obj-functor.lo' libtool=yes @AMDEPBACKSLASH@
+libgpython_la-py-obj_staticmethod.lo: runtime/py-obj_staticmethod.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-py-obj_staticmethod.lo -MD -MP -MF $(DEPDIR)/libgpython_la-py-obj_staticmethod.Tpo -c -o libgpython_la-py-obj_staticmethod.lo `test -f 'runtime/py-obj_staticmethod.c' || echo '$(srcdir)/'`runtime/py-obj_staticmethod.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libgpython_la-py-obj_staticmethod.Tpo $(DEPDIR)/libgpython_la-py-obj_staticmethod.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/py-obj_staticmethod.c' object='libgpython_la-py-obj_staticmethod.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -c -o libgpython_la-obj-functor.lo `test -f 'runtime/obj-functor.c' || echo '$(srcdir)/'`runtime/obj-functor.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -c -o libgpython_la-py-obj_staticmethod.lo `test -f 'runtime/py-obj_staticmethod.c' || echo '$(srcdir)/'`runtime/py-obj_staticmethod.c
 
-libgpython_la-obj-integer.lo: runtime/obj-integer.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-obj-integer.lo -MD -MP -MF $(DEPDIR)/libgpython_la-obj-integer.Tpo -c -o libgpython_la-obj-integer.lo `test -f 'runtime/obj-integer.c' || echo '$(srcdir)/'`runtime/obj-integer.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libgpython_la-obj-integer.Tpo $(DEPDIR)/libgpython_la-obj-integer.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/obj-integer.c' object='libgpython_la-obj-integer.lo' libtool=yes @AMDEPBACKSLASH@
+libgpython_la-py-obj_classmethod.lo: runtime/py-obj_classmethod.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-py-obj_classmethod.lo -MD -MP -MF $(DEPDIR)/libgpython_la-py-obj_classmethod.Tpo -c -o libgpython_la-py-obj_classmethod.lo `test -f 'runtime/py-obj_classmethod.c' || echo '$(srcdir)/'`runtime/py-obj_classmethod.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libgpython_la-py-obj_classmethod.Tpo $(DEPDIR)/libgpython_la-py-obj_classmethod.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/py-obj_classmethod.c' object='libgpython_la-py-obj_classmethod.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -c -o libgpython_la-obj-integer.lo `test -f 'runtime/obj-integer.c' || echo '$(srcdir)/'`runtime/obj-integer.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -c -o libgpython_la-py-obj_classmethod.lo `test -f 'runtime/py-obj_classmethod.c' || echo '$(srcdir)/'`runtime/py-obj_classmethod.c
 
-libgpython_la-obj-list.lo: runtime/obj-list.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-obj-list.lo -MD -MP -MF $(DEPDIR)/libgpython_la-obj-list.Tpo -c -o libgpython_la-obj-list.lo `test -f 'runtime/obj-list.c' || echo '$(srcdir)/'`runtime/obj-list.c
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libgpython_la-obj-list.Tpo $(DEPDIR)/libgpython_la-obj-list.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/obj-list.c' object='libgpython_la-obj-list.lo' libtool=yes @AMDEPBACKSLASH@
+libgpython_la-py-obj_integer.lo: runtime/py-obj_integer.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-py-obj_integer.lo -MD -MP -MF $(DEPDIR)/libgpython_la-py-obj_integer.Tpo -c -o libgpython_la-py-obj_integer.lo `test -f 'runtime/py-obj_integer.c' || echo '$(srcdir)/'`runtime/py-obj_integer.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libgpython_la-py-obj_integer.Tpo $(DEPDIR)/libgpython_la-py-obj_integer.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/py-obj_integer.c' object='libgpython_la-py-obj_integer.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -c -o libgpython_la-obj-list.lo `test -f 'runtime/obj-list.c' || echo '$(srcdir)/'`runtime/obj-list.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -c -o libgpython_la-py-obj_integer.lo `test -f 'runtime/py-obj_integer.c' || echo '$(srcdir)/'`runtime/py-obj_integer.c
+
+libgpython_la-py-obj_list.lo: runtime/py-obj_list.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-py-obj_list.lo -MD -MP -MF $(DEPDIR)/libgpython_la-py-obj_list.Tpo -c -o libgpython_la-py-obj_list.lo `test -f 'runtime/py-obj_list.c' || echo '$(srcdir)/'`runtime/py-obj_list.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libgpython_la-py-obj_list.Tpo $(DEPDIR)/libgpython_la-py-obj_list.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='runtime/py-obj_list.c' object='libgpython_la-py-obj_list.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -c -o libgpython_la-py-obj_list.lo `test -f 'runtime/py-obj_list.c' || echo '$(srcdir)/'`runtime/py-obj_list.c
 
 libgpython_la-py-main.lo: runtime/py-main.c
 @am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgpython_la_CFLAGS) $(CFLAGS) -MT libgpython_la-py-main.lo -MD -MP -MF $(DEPDIR)/libgpython_la-py-main.Tpo -c -o libgpython_la-py-main.lo `test -f 'runtime/py-main.c' || echo '$(srcdir)/'`runtime/py-main.c
diff --git a/libgpython/autom4te.cache/requests b/libgpython/autom4te.cache/requests
index 179832fd38b..2714163772d 100644
--- a/libgpython/autom4te.cache/requests
+++ b/libgpython/autom4te.cache/requests
@@ -15,55 +15,55 @@
                         'configure.ac'
                       ],
                       {
-                        '_LT_AC_TAGCONFIG' => 1,
                         'AM_PROG_F77_C_O' => 1,
-                        'AC_INIT' => 1,
+                        '_LT_AC_TAGCONFIG' => 1,
                         'm4_pattern_forbid' => 1,
-                        'AC_CANONICAL_TARGET' => 1,
+                        'AC_INIT' => 1,
                         '_AM_COND_IF' => 1,
-                        'AC_CONFIG_LIBOBJ_DIR' => 1,
+                        'AC_CANONICAL_TARGET' => 1,
                         'AC_SUBST' => 1,
-                        'AC_CANONICAL_HOST' => 1,
+                        'AC_CONFIG_LIBOBJ_DIR' => 1,
                         'AC_FC_SRCEXT' => 1,
+                        'AC_CANONICAL_HOST' => 1,
                         'AC_PROG_LIBTOOL' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_PATH_GUILE' => 1,
+                        'AC_CONFIG_SUBDIRS' => 1,
                         'AM_AUTOMAKE_VERSION' => 1,
                         'LT_CONFIG_LTDL_DIR' => 1,
-                        'AC_CONFIG_LINKS' => 1,
                         'AC_REQUIRE_AUX_FILE' => 1,
-                        'm4_sinclude' => 1,
+                        'AC_CONFIG_LINKS' => 1,
                         'LT_SUPPORTED_TAG' => 1,
+                        'm4_sinclude' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AM_NLS' => 1,
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
-                        '_m4_warn' => 1,
                         'AM_MAKEFILE_INCLUDE' => 1,
+                        '_m4_warn' => 1,
                         'AM_PROG_CXX_C_O' => 1,
-                        '_AM_COND_ENDIF' => 1,
                         '_AM_MAKEFILE_INCLUDE' => 1,
+                        '_AM_COND_ENDIF' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
                         'AM_PROG_MOC' => 1,
                         'AM_SILENT_RULES' => 1,
                         'AC_CONFIG_FILES' => 1,
-                        'include' => 1,
                         'LT_INIT' => 1,
-                        'AM_GNU_GETTEXT' => 1,
+                        'include' => 1,
                         'AM_PROG_AR' => 1,
+                        'AM_GNU_GETTEXT' => 1,
                         'AC_LIBSOURCE' => 1,
-                        'AC_CANONICAL_BUILD' => 1,
                         'AM_PROG_FC_C_O' => 1,
+                        'AC_CANONICAL_BUILD' => 1,
                         'AC_FC_FREEFORM' => 1,
                         'AH_OUTPUT' => 1,
-                        'AC_CONFIG_AUX_DIR' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
-                        'AM_PROG_CC_C_O' => 1,
-                        'sinclude' => 1,
+                        'AC_CONFIG_AUX_DIR' => 1,
                         'm4_pattern_allow' => 1,
-                        'AM_CONDITIONAL' => 1,
-                        'AC_CANONICAL_SYSTEM' => 1,
+                        'sinclude' => 1,
+                        'AM_PROG_CC_C_O' => 1,
                         'AM_XGETTEXT_OPTION' => 1,
+                        'AC_CANONICAL_SYSTEM' => 1,
+                        'AM_CONDITIONAL' => 1,
                         'AC_CONFIG_HEADERS' => 1,
                         'AC_DEFINE_TRACE_LITERAL' => 1,
                         'AM_POT_TOOLS' => 1,
@@ -127,8 +127,8 @@
                         '_m4_warn' => 1,
                         'AC_LIBTOOL_OBJDIR' => 1,
                         'gl_FUNC_ARGZ' => 1,
-                        'AM_SANITY_CHECK' => 1,
                         'LTOBSOLETE_VERSION' => 1,
+                        'AM_SANITY_CHECK' => 1,
                         'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
                         'LT_LIB_M' => 1,
@@ -142,19 +142,19 @@
                         '_LT_WITH_SYSROOT' => 1,
                         'LT_SYS_DLOPEN_DEPLIBS' => 1,
                         'LT_FUNC_DLSYM_USCORE' => 1,
-                        '_LT_AC_LANG_F77' => 1,
                         'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_LTDL_DLLIB' => 1,
+                        '_LT_AC_LANG_F77' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_LTDL_DLLIB' => 1,
                         '_AM_AUTOCONF_VERSION' => 1,
                         'AM_DISABLE_SHARED' => 1,
                         '_LT_PROG_ECHO_BACKSLASH' => 1,
                         '_LTDL_SETUP' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
                         '_LT_AC_LANG_CXX' => 1,
-                        'AM_PROG_LD' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
                         'AC_LIB_LTDL' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AM_PROG_LD' => 1,
                         'AU_DEFUN' => 1,
                         'AC_PROG_NM' => 1,
                         'AC_LIBTOOL_DLOPEN' => 1,
@@ -178,35 +178,35 @@
                         '_LT_AC_LANG_GCJ' => 1,
                         'AC_LTDL_OBJDIR' => 1,
                         '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIBTOOL_RC' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_RC' => 1,
                         'AM_SILENT_RULES' => 1,
-                        'include' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
                         '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'include' => 1,
                         'LT_AC_PROG_SED' => 1,
                         'AM_ENABLE_SHARED' => 1,
                         'LTDL_INSTALLABLE' => 1,
                         '_LT_AC_LANG_GCJ_CONFIG' => 1,
                         'AC_ENABLE_SHARED' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
                         'AC_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
                         '_LT_AC_TAGVAR' => 1,
                         'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
                         'AM_CONDITIONAL' => 1,
                         'LT_LIB_DLLOAD' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        '_LT_PROG_F77' => 1,
                         'LTDL_INIT' => 1,
-                        'm4_include' => 1,
+                        '_LT_PROG_F77' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'LTVERSION_VERSION' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
+                        'm4_include' => 1,
                         'AC_PROG_EGREP' => 1,
-                        'AC_PATH_MAGIC' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AC_PATH_MAGIC' => 1,
                         'AC_LTDL_SYSSEARCHPATH' => 1,
                         'AM_MAKE_INCLUDE' => 1,
                         'LT_CMD_MAX_LEN' => 1,
@@ -240,11 +240,11 @@
                         '_AC_PROG_LIBTOOL' => 1,
                         '_AM_IF_OPTION' => 1,
                         'AC_PATH_TOOL_PREFIX' => 1,
-                        'm4_pattern_allow' => 1,
                         'AC_LIBTOOL_F77' => 1,
+                        'm4_pattern_allow' => 1,
                         'AM_SET_LEADING_DOT' => 1,
-                        '_LT_PROG_FC' => 1,
                         'LT_AC_PROG_EGREP' => 1,
+                        '_LT_PROG_FC' => 1,
                         '_AM_DEPENDENCIES' => 1,
                         'AC_LIBTOOL_LANG_C_CONFIG' => 1,
                         'LTOPTIONS_VERSION' => 1,
@@ -252,40 +252,40 @@
                         'AM_PROG_NM' => 1,
                         'AC_LIBLTDL_CONVENIENCE' => 1,
                         'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'jm_MAINTAINER_MODE' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'jm_MAINTAINER_MODE' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
                         'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'LT_PROG_GCJ' => 1,
                         'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'LT_PROG_GCJ' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        'gl_VISIBILITY' => 1,
                         'AC_DISABLE_STATIC' => 1,
+                        'gl_VISIBILITY' => 1,
                         'LT_PATH_NM' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AC_LTDL_SHLIBEXT' => 1,
                         '_LT_AC_LOCK' => 1,
                         '_LT_AC_LANG_RC_CONFIG' => 1,
                         'LT_SYS_MODULE_PATH' => 1,
-                        'LT_WITH_LTDL' => 1,
                         'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'LT_WITH_LTDL' => 1,
                         'AC_LTDL_SHLIBPATH' => 1,
                         'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
                         '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
                         '_AM_SET_OPTIONS' => 1,
-                        'AM_RUN_LOG' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
                         '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_RUN_LOG' => 1,
                         'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_CHECK_LIBM' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
                         'LT_PATH_LD' => 1,
+                        'AC_CHECK_LIBM' => 1,
                         'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
                         '_AM_MANGLE_OPTION' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
                         'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
                         'AM_SET_DEPDIR' => 1,
                         '_LT_CC_BASENAME' => 1,
                         '_LT_LIBOBJ' => 1
@@ -346,8 +346,8 @@
                         '_m4_warn' => 1,
                         'AC_LIBTOOL_OBJDIR' => 1,
                         'gl_FUNC_ARGZ' => 1,
-                        'AM_SANITY_CHECK' => 1,
                         'LTOBSOLETE_VERSION' => 1,
+                        'AM_SANITY_CHECK' => 1,
                         'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
                         'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
                         'LT_LIB_M' => 1,
@@ -361,19 +361,19 @@
                         '_LT_WITH_SYSROOT' => 1,
                         'LT_SYS_DLOPEN_DEPLIBS' => 1,
                         'LT_FUNC_DLSYM_USCORE' => 1,
-                        '_LT_AC_LANG_F77' => 1,
                         'AC_LIBTOOL_CONFIG' => 1,
-                        'AC_LTDL_DLLIB' => 1,
+                        '_LT_AC_LANG_F77' => 1,
                         '_AM_SUBST_NOTMAKE' => 1,
+                        'AC_LTDL_DLLIB' => 1,
                         '_AM_AUTOCONF_VERSION' => 1,
                         'AM_DISABLE_SHARED' => 1,
                         '_LT_PROG_ECHO_BACKSLASH' => 1,
                         '_LTDL_SETUP' => 1,
-                        'AM_PROG_LIBTOOL' => 1,
                         '_LT_AC_LANG_CXX' => 1,
-                        'AM_PROG_LD' => 1,
-                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AM_PROG_LIBTOOL' => 1,
                         'AC_LIB_LTDL' => 1,
+                        '_LT_AC_FILE_LTDLL_C' => 1,
+                        'AM_PROG_LD' => 1,
                         'AU_DEFUN' => 1,
                         'AC_PROG_NM' => 1,
                         'AC_LIBTOOL_DLOPEN' => 1,
@@ -397,35 +397,35 @@
                         '_LT_AC_LANG_GCJ' => 1,
                         'AC_LTDL_OBJDIR' => 1,
                         '_LT_PATH_TOOL_PREFIX' => 1,
-                        'AC_LIBTOOL_RC' => 1,
                         'AM_ENABLE_MULTILIB' => 1,
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
-                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        'AC_LIBTOOL_RC' => 1,
                         'AM_SILENT_RULES' => 1,
-                        'include' => 1,
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'AC_DISABLE_FAST_INSTALL' => 1,
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
                         '_LT_AC_SYS_LIBPATH_AIX' => 1,
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
+                        'include' => 1,
                         'LT_AC_PROG_SED' => 1,
                         'AM_ENABLE_SHARED' => 1,
                         'LTDL_INSTALLABLE' => 1,
                         '_LT_AC_LANG_GCJ_CONFIG' => 1,
                         'AC_ENABLE_SHARED' => 1,
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
                         'AC_ENABLE_STATIC' => 1,
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
                         '_LT_AC_TAGVAR' => 1,
                         'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
                         'AM_CONDITIONAL' => 1,
                         'LT_LIB_DLLOAD' => 1,
-                        'LTVERSION_VERSION' => 1,
-                        '_LT_PROG_CXX' => 1,
-                        '_LT_PROG_F77' => 1,
                         'LTDL_INIT' => 1,
-                        'm4_include' => 1,
+                        '_LT_PROG_F77' => 1,
+                        '_LT_PROG_CXX' => 1,
+                        'LTVERSION_VERSION' => 1,
                         'AM_PROG_INSTALL_SH' => 1,
+                        'm4_include' => 1,
                         'AC_PROG_EGREP' => 1,
-                        'AC_PATH_MAGIC' => 1,
                         '_AC_AM_CONFIG_HEADER_HOOK' => 1,
+                        'AC_PATH_MAGIC' => 1,
                         'AC_LTDL_SYSSEARCHPATH' => 1,
                         'AM_MAKE_INCLUDE' => 1,
                         'LT_CMD_MAX_LEN' => 1,
@@ -459,11 +459,11 @@
                         '_AC_PROG_LIBTOOL' => 1,
                         '_AM_IF_OPTION' => 1,
                         'AC_PATH_TOOL_PREFIX' => 1,
-                        'm4_pattern_allow' => 1,
                         'AC_LIBTOOL_F77' => 1,
+                        'm4_pattern_allow' => 1,
                         'AM_SET_LEADING_DOT' => 1,
-                        '_LT_PROG_FC' => 1,
                         'LT_AC_PROG_EGREP' => 1,
+                        '_LT_PROG_FC' => 1,
                         '_AM_DEPENDENCIES' => 1,
                         'AC_LIBTOOL_LANG_C_CONFIG' => 1,
                         'LTOPTIONS_VERSION' => 1,
@@ -471,40 +471,40 @@
                         'AM_PROG_NM' => 1,
                         'AC_LIBLTDL_CONVENIENCE' => 1,
                         'AC_DEPLIBS_CHECK_METHOD' => 1,
-                        'AC_LIBLTDL_INSTALLABLE' => 1,
-                        'jm_MAINTAINER_MODE' => 1,
                         'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
+                        'jm_MAINTAINER_MODE' => 1,
+                        'AC_LIBLTDL_INSTALLABLE' => 1,
                         'AC_LTDL_ENABLE_INSTALL' => 1,
-                        'LT_PROG_GCJ' => 1,
                         'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
+                        'LT_PROG_GCJ' => 1,
                         'AM_INIT_AUTOMAKE' => 1,
-                        'gl_VISIBILITY' => 1,
                         'AC_DISABLE_STATIC' => 1,
+                        'gl_VISIBILITY' => 1,
                         'LT_PATH_NM' => 1,
                         'AM_MAINTAINER_MODE' => 1,
                         'AC_LTDL_SHLIBEXT' => 1,
                         '_LT_AC_LOCK' => 1,
                         '_LT_AC_LANG_RC_CONFIG' => 1,
                         'LT_SYS_MODULE_PATH' => 1,
-                        'LT_WITH_LTDL' => 1,
                         'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
+                        'LT_WITH_LTDL' => 1,
                         'AC_LTDL_SHLIBPATH' => 1,
                         'AM_AUX_DIR_EXPAND' => 1,
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
                         '_LT_AC_LANG_F77_CONFIG' => 1,
-                        '_LT_COMPILER_OPTION' => 1,
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
                         '_AM_SET_OPTIONS' => 1,
-                        'AM_RUN_LOG' => 1,
+                        '_LT_COMPILER_OPTION' => 1,
                         '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
-                        'AC_LIBTOOL_PICMODE' => 1,
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AM_RUN_LOG' => 1,
                         'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
-                        'AC_CHECK_LIBM' => 1,
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
+                        'AC_LIBTOOL_PICMODE' => 1,
                         'LT_PATH_LD' => 1,
+                        'AC_CHECK_LIBM' => 1,
                         'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
                         '_AM_MANGLE_OPTION' => 1,
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
                         'AC_LTDL_SYMBOL_USCORE' => 1,
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
                         'AM_SET_DEPDIR' => 1,
                         '_LT_CC_BASENAME' => 1,
                         '_LT_LIBOBJ' => 1