1. clamav-devel
  2. Commit df6d010fcb11c4cab3eaa97135c2148f93fb4cfa
Browse code

bb11062 - pointing make to correct libmspack libtool objects

Mickey Sola authored on 2016/11/12 01:20:54
Showing 3 changed files
libclamav/Makefile.am
History View file @ df6d010
... ... 
@@ -159,28 +159,28 @@ endif
159 159 
 if USE_INTERNAL_MSPACK
160 160 
 SUBDIRS += libmspack-0.5alpha
161 161 
 libclamav_la_CFLAGS += -I@top_srcdir@/libclamav/libmspack-0.5alpha/mspack
162 
-libclamav_la_LIBADD +=  @top_builddir@/libclamav/libmspack-0.5alpha/.libs/cabc.lo \
163 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/system.lo \
164 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/kwajd.lo \
165 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/hlpc.lo \
166 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/chmd.lo \
167 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/qtmd.lo \
168 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/litc.lo \
169 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/oabc.lo \
170 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/lzxd.lo \
171 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/litd.lo \
172 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/crc32.lo \
173 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/lzssd.lo \
174 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/kwajc.lo \
175 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/cabd.lo \
176 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/szddd.lo \
177 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/lzxc.lo \
178 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/mszipd.lo \
179 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/szddc.lo \
180 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/oabd.lo \
181 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/chmc.lo \
182 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/mszipc.lo \
183 
-			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/hlpd.lo
162 
+libclamav_la_LIBADD +=  @top_builddir@/libclamav/libmspack-0.5alpha/cabc.lo \
163 
+			@top_builddir@/libclamav/libmspack-0.5alpha/system.lo \
164 
+			@top_builddir@/libclamav/libmspack-0.5alpha/kwajd.lo \
165 
+			@top_builddir@/libclamav/libmspack-0.5alpha/hlpc.lo \
166 
+			@top_builddir@/libclamav/libmspack-0.5alpha/chmd.lo \
167 
+			@top_builddir@/libclamav/libmspack-0.5alpha/qtmd.lo \
168 
+			@top_builddir@/libclamav/libmspack-0.5alpha/litc.lo \
169 
+			@top_builddir@/libclamav/libmspack-0.5alpha/oabc.lo \
170 
+			@top_builddir@/libclamav/libmspack-0.5alpha/lzxd.lo \
171 
+			@top_builddir@/libclamav/libmspack-0.5alpha/litd.lo \
172 
+			@top_builddir@/libclamav/libmspack-0.5alpha/crc32.lo \
173 
+			@top_builddir@/libclamav/libmspack-0.5alpha/lzssd.lo \
174 
+			@top_builddir@/libclamav/libmspack-0.5alpha/kwajc.lo \
175 
+			@top_builddir@/libclamav/libmspack-0.5alpha/cabd.lo \
176 
+			@top_builddir@/libclamav/libmspack-0.5alpha/szddd.lo \
177 
+			@top_builddir@/libclamav/libmspack-0.5alpha/lzxc.lo \
178 
+			@top_builddir@/libclamav/libmspack-0.5alpha/mszipd.lo \
179 
+			@top_builddir@/libclamav/libmspack-0.5alpha/szddc.lo \
180 
+			@top_builddir@/libclamav/libmspack-0.5alpha/oabd.lo \
181 
+			@top_builddir@/libclamav/libmspack-0.5alpha/chmc.lo \
182 
+			@top_builddir@/libclamav/libmspack-0.5alpha/mszipc.lo \
183 
+			@top_builddir@/libclamav/libmspack-0.5alpha/hlpd.lo
184 184 
 COMMON_CLEANFILES+=@top_builddir@/libclamav/libmspack-0.5alpha/config.h @top_builddir@/libclamav/libmspack-0.5alpha/libmspack.pc
185 185 
 else
186 186 
 libclamav_la_CFLAGS += $(LIBMSPACK_CFLAGS)
libclamav/Makefile.in
History View file @ df6d010
... ... 
@@ -111,28 +111,28 @@ target_triplet = @target@
111 111 
 @VERSIONSCRIPT_TRUE@am__append_7 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map
112 112 
 @USE_INTERNAL_MSPACK_TRUE@am__append_8 = libmspack-0.5alpha
113 113 
 @USE_INTERNAL_MSPACK_TRUE@am__append_9 = -I@top_srcdir@/libclamav/libmspack-0.5alpha/mspack
114 
-@USE_INTERNAL_MSPACK_TRUE@am__append_10 = @top_builddir@/libclamav/libmspack-0.5alpha/.libs/cabc.lo \
115 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/system.lo \
116 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/kwajd.lo \
117 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/hlpc.lo \
118 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/chmd.lo \
119 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/qtmd.lo \
120 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/litc.lo \
121 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/oabc.lo \
122 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/lzxd.lo \
123 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/litd.lo \
124 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/crc32.lo \
125 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/lzssd.lo \
126 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/kwajc.lo \
127 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/cabd.lo \
128 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/szddd.lo \
129 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/lzxc.lo \
130 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/mszipd.lo \
131 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/szddc.lo \
132 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/oabd.lo \
133 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/chmc.lo \
134 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/mszipc.lo \
135 
-@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/.libs/hlpd.lo
114 
+@USE_INTERNAL_MSPACK_TRUE@am__append_10 = @top_builddir@/libclamav/libmspack-0.5alpha/cabc.lo \
115 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/system.lo \
116 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/kwajd.lo \
117 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/hlpc.lo \
118 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/chmd.lo \
119 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/qtmd.lo \
120 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/litc.lo \
121 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/oabc.lo \
122 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/lzxd.lo \
123 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/litd.lo \
124 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/crc32.lo \
125 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/lzssd.lo \
126 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/kwajc.lo \
127 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/cabd.lo \
128 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/szddd.lo \
129 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/lzxc.lo \
130 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/mszipd.lo \
131 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/szddc.lo \
132 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/oabd.lo \
133 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/chmc.lo \
134 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/mszipc.lo \
135 
+@USE_INTERNAL_MSPACK_TRUE@			@top_builddir@/libclamav/libmspack-0.5alpha/hlpd.lo
136 136
137 137 
 @USE_INTERNAL_MSPACK_TRUE@am__append_11 = @top_builddir@/libclamav/libmspack-0.5alpha/config.h @top_builddir@/libclamav/libmspack-0.5alpha/libmspack.pc
138 138 
 @USE_INTERNAL_MSPACK_FALSE@am__append_12 = $(LIBMSPACK_CFLAGS)
libclamav/libmspack-0.5alpha/autom4te.cache/requests
History View file @ df6d010
... ... 
@@ -41,185 +41,185 @@
41 41 
                         'configure.ac'
42 42 
                       ],
43 43 
                       {
44 
-                        'AC_ENABLE_STATIC' => 1,
45 
-                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
46 
-                        '_AM_SET_OPTIONS' => 1,
47 
-                        'LT_PATH_LD' => 1,
48 
-                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
49 
-                        '_LT_PROG_F77' => 1,
50 
-                        '_m4_warn' => 1,
51 
-                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
52 
-                        'AM_DEP_TRACK' => 1,
53 
-                        'AM_MISSING_HAS_RUN' => 1,
54 
-                        '_LT_PROG_LTMAIN' => 1,
55 
-                        'AC_LIBTOOL_FC' => 1,
56 
-                        'LTDL_INIT' => 1,
57 
-                        'AC_LTDL_DLSYM_USCORE' => 1,
58 
-                        'AC_CHECK_LIBM' => 1,
59 
-                        '_LT_AC_TAGVAR' => 1,
60 
-                        'AC_LTDL_ENABLE_INSTALL' => 1,
61 
-                        '_LT_COMPILER_OPTION' => 1,
62 
-                        'AM_PROG_CC_C_O' => 1,
63 
-                        'AC_DISABLE_SHARED' => 1,
64 
-                        'AC_PROG_LIBTOOL' => 1,
65 
-                        'AC_LIB_LTDL' => 1,
66 
-                        '_AM_PROG_CC_C_O' => 1,
67 
-                        'LT_LIB_M' => 1,
68 
-                        'AM_SET_DEPDIR' => 1,
69 
-                        '_LT_AC_FILE_LTDLL_C' => 1,
70 
-                        'LT_PATH_NM' => 1,
71 
-                        '_AC_PROG_LIBTOOL' => 1,
72 
-                        'AM_ENABLE_STATIC' => 1,
73 
-                        '_LT_COMPILER_BOILERPLATE' => 1,
44 
+                        'LT_SUPPORTED_TAG' => 1,
74 45 
                         '_LT_AC_LANG_CXX_CONFIG' => 1,
75 
-                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
76 
-                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
77 
-                        'AC_LIBTOOL_RC' => 1,
78 
-                        'AC_WITH_LTDL' => 1,
79 
-                        'LTOPTIONS_VERSION' => 1,
80 
-                        'LTDL_CONVENIENCE' => 1,
81 
-                        'AM_PROG_NM' => 1,
82 
-                        'AM_DISABLE_STATIC' => 1,
83 
-                        'AC_LIBTOOL_CONFIG' => 1,
84 
-                        'AM_SUBST_NOTMAKE' => 1,
85 
-                        '_LTDL_SETUP' => 1,
86 
-                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
87 
-                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
88 
-                        'AC_LIBTOOL_OBJDIR' => 1,
89 
-                        'AM_PROG_LD' => 1,
46 
+                        '_LT_AC_TAGCONFIG' => 1,
47 
+                        'LT_PROG_GCJ' => 1,
48 
+                        'AM_MAKE_INCLUDE' => 1,
49 
+                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
50 
+                        '_LT_LINKER_OPTION' => 1,
51 
+                        'AC_DISABLE_FAST_INSTALL' => 1,
52 
+                        'AC_LIBTOOL_SETUP' => 1,
53 
+                        'LT_SYS_DLOPEN_SELF' => 1,
54 
+                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
55 
+                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
56 
+                        'LTSUGAR_VERSION' => 1,
57 
+                        'AM_PROG_INSTALL_STRIP' => 1,
58 
+                        'AM_MISSING_PROG' => 1,
59 
+                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
60 
+                        '_LT_PATH_TOOL_PREFIX' => 1,
61 
+                        'AC_CHECK_LIBM' => 1,
62 
+                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
63 
+                        '_LT_PROG_CXX' => 1,
64 
+                        'AC_DISABLE_STATIC' => 1,
90 65 
                         '_LT_AC_CHECK_DLFCN' => 1,
91 
-                        'LT_CMD_MAX_LEN' => 1,
66 
+                        'AU_DEFUN' => 1,
67 
+                        'AC_LTDL_DLLIB' => 1,
68 
+                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
69 
+                        'include' => 1,
70 
+                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
71 
+                        '_LT_AC_LANG_C_CONFIG' => 1,
72 
+                        'gl_PREREQ_ARGZ' => 1,
73 
+                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
74 
+                        'LT_LANG' => 1,
75 
+                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
76 
+                        '_LT_AC_TAGVAR' => 1,
77 
+                        'AM_MISSING_HAS_RUN' => 1,
92 78 
                         '_LT_PROG_ECHO_BACKSLASH' => 1,
79 
+                        '_LT_PROG_F77' => 1,
80 
+                        'AC_ENABLE_STATIC' => 1,
81 
+                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
82 
+                        'LT_AC_PROG_EGREP' => 1,
83 
+                        '_LT_WITH_SYSROOT' => 1,
84 
+                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
85 
+                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
86 
+                        '_LT_LIBOBJ' => 1,
87 
+                        'LT_CMD_MAX_LEN' => 1,
88 
+                        'm4_include' => 1,
89 
+                        'AC_LIB_LTDL' => 1,
93 90 
                         'AC_LTDL_PREOPEN' => 1,
94 
-                        'AC_LIBTOOL_LINKER_OPTION' => 1,
95 
-                        '_AM_IF_OPTION' => 1,
96 
-                        'AM_INIT_AUTOMAKE' => 1,
97 
-                        'AC_LTDL_SHLIBPATH' => 1,
98 
-                        '_LT_AC_LANG_GCJ' => 1,
99 
-                        '_LT_PROG_CXX' => 1,
100 
-                        'AC_CONFIG_MACRO_DIR_TRACE' => 1,
101 
-                        'AM_PROG_INSTALL_SH' => 1,
102 
-                        'LTVERSION_VERSION' => 1,
103 
-                        '_LT_AC_LANG_F77' => 1,
91 
+                        '_AM_DEPENDENCIES' => 1,
92 
+                        '_AM_SUBST_NOTMAKE' => 1,
93 
+                        'AC_LTDL_SYMBOL_USCORE' => 1,
104 94 
                         'LT_AC_PROG_RC' => 1,
105 
-                        'LT_PROG_GCJ' => 1,
106 
-                        'AC_DEFUN' => 1,
107 
-                        'LT_SYS_DLSEARCH_PATH' => 1,
108 
-                        'AC_LTDL_DLLIB' => 1,
109 
-                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
110 
-                        'AC_DISABLE_STATIC' => 1,
111 
-                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
112 
-                        'LT_PROG_RC' => 1,
113 
-                        'AC_ENABLE_FAST_INSTALL' => 1,
114 95 
                         'LTDL_INSTALLABLE' => 1,
96 
+                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
97 
+                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
98 
+                        '_LT_PREPARE_SED_QUOTE_VARS' => 1,
99 
+                        '_LTDL_SETUP' => 1,
100 
+                        'AC_LIBTOOL_WIN32_DLL' => 1,
101 
+                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
102 
+                        '_AM_AUTOCONF_VERSION' => 1,
103 
+                        '_LT_AC_LANG_CXX' => 1,
104 
+                        'LT_SYS_DLSEARCH_PATH' => 1,
105 
+                        'AC_LIBTOOL_PICMODE' => 1,
106 
+                        'AM_DEP_TRACK' => 1,
107 
+                        '_AM_PROG_TAR' => 1,
108 
+                        '_LT_AC_SHELL_INIT' => 1,
109 
+                        'AC_LIBTOOL_CONFIG' => 1,
110 
+                        'AC_ENABLE_SHARED' => 1,
111 
+                        'AC_LIBTOOL_LINKER_OPTION' => 1,
115 112 
                         'LT_INIT' => 1,
116 
-                        'gl_PREREQ_ARGZ' => 1,
117 
-                        'AC_LIBTOOL_DLOPEN' => 1,
118 
-                        'LT_SYS_SYMBOL_USCORE' => 1,
119 
-                        '_LT_LINKER_BOILERPLATE' => 1,
120 
-                        'LT_SYS_MODULE_EXT' => 1,
113 
+                        '_AM_PROG_CC_C_O' => 1,
114 
+                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
121 115 
                         'gl_FUNC_ARGZ' => 1,
122 
-                        '_AM_SUBST_NOTMAKE' => 1,
123 
-                        'AM_PROG_INSTALL_STRIP' => 1,
116 
+                        'LT_AC_PROG_SED' => 1,
117 
+                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
118 
+                        'AM_AUX_DIR_EXPAND' => 1,
119 
+                        '_LT_AC_LANG_F77' => 1,
120 
+                        'AM_PROG_NM' => 1,
124 121 
                         'AC_LIBTOOL_F77' => 1,
125 
-                        'LT_AC_PROG_GCJ' => 1,
126 
-                        'LT_SYS_DLOPEN_SELF' => 1,
127 
-                        'AM_MAKE_INCLUDE' => 1,
128 
-                        'AM_AUTOMAKE_VERSION' => 1,
129 
-                        'AC_DISABLE_FAST_INSTALL' => 1,
130 
-                        'AC_LTDL_SHLIBEXT' => 1,
122 
+                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
123 
+                        'LTDL_INIT' => 1,
124 
+                        'AC_PROG_LD_GNU' => 1,
131 125 
                         '_LT_AC_LANG_F77_CONFIG' => 1,
132 
-                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
133 
-                        'm4_pattern_forbid' => 1,
134 
-                        '_AM_SET_OPTION' => 1,
135 
-                        'AM_MISSING_PROG' => 1,
136 
-                        'AC_LIBTOOL_PICMODE' => 1,
137 
-                        '_LT_AC_LANG_RC_CONFIG' => 1,
138 
-                        'AC_PROG_LD_RELOAD_FLAG' => 1,
139 
-                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
126 
+                        'LT_AC_PROG_GCJ' => 1,
127 
+                        'AC_PATH_MAGIC' => 1,
128 
+                        '_LT_AC_FILE_LTDLL_C' => 1,
129 
+                        'AC_LIBTOOL_RC' => 1,
130 
+                        '_LT_PROG_FC' => 1,
131 
+                        '_LT_COMPILER_OPTION' => 1,
132 
+                        '_LT_PROG_LTMAIN' => 1,
133 
+                        'AM_SET_LEADING_DOT' => 1,
134 
+                        '_LT_AC_SYS_COMPILER' => 1,
135 
+                        'AM_CONDITIONAL' => 1,
136 
+                        'LTVERSION_VERSION' => 1,
137 
+                        'LT_PROG_GO' => 1,
138 
+                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
139 
+                        'LT_SYS_MODULE_PATH' => 1,
140 
+                        'AC_PROG_LD' => 1,
141 
+                        '_AM_IF_OPTION' => 1,
142 
+                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
143 
+                        'AC_DEFUN' => 1,
144 
+                        'LT_FUNC_DLSYM_USCORE' => 1,
140 145 
                         'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
141 
-                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
142 
-                        '_LT_PATH_TOOL_PREFIX' => 1,
143 
-                        'LT_LIB_DLLOAD' => 1,
144 
-                        'm4_pattern_allow' => 1,
146 
+                        'AC_ENABLE_FAST_INSTALL' => 1,
147 
+                        'AC_LTDL_SYSSEARCHPATH' => 1,
148 
+                        'LT_SYS_SYMBOL_USCORE' => 1,
149 
+                        'AM_SILENT_RULES' => 1,
145 150 
                         'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
146 
-                        '_AM_DEPENDENCIES' => 1,
147 
-                        'AU_DEFUN' => 1,
148 
-                        '_AM_AUTOCONF_VERSION' => 1,
149 
-                        'AC_PROG_NM' => 1,
150 
-                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
151 
+                        'AM_PROG_CC_C_O' => 1,
152 
+                        '_LT_COMPILER_BOILERPLATE' => 1,
153 
+                        '_AC_PROG_LIBTOOL' => 1,
154 
+                        '_m4_warn' => 1,
155 
+                        'LT_PATH_LD' => 1,
156 
+                        'LTDL_CONVENIENCE' => 1,
157 
+                        'AM_DISABLE_SHARED' => 1,
151 158 
                         'AC_LIBTOOL_GCJ' => 1,
159 
+                        'AC_LTDL_SHLIBPATH' => 1,
160 
+                        'LT_PATH_NM' => 1,
161 
+                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
162 
+                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
163 
+                        'm4_pattern_allow' => 1,
164 
+                        'AM_SUBST_NOTMAKE' => 1,
165 
+                        '_AM_MANGLE_OPTION' => 1,
166 
+                        'AM_AUTOMAKE_VERSION' => 1,
167 
+                        'AM_DISABLE_STATIC' => 1,
168 
+                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
152 169 
                         'AC_LTDL_OBJDIR' => 1,
170 
+                        '_AM_CONFIG_MACRO_DIRS' => 1,
153 171 
                         'AC_DEPLIBS_CHECK_METHOD' => 1,
154 
-                        'AM_SET_LEADING_DOT' => 1,
155 
-                        'LT_PROG_GO' => 1,
156 
-                        'LT_AC_PROG_EGREP' => 1,
172 
+                        'AM_SET_DEPDIR' => 1,
173 
+                        'AC_PROG_NM' => 1,
174 
+                        'AM_PROG_INSTALL_SH' => 1,
175 
+                        'LT_PROG_RC' => 1,
176 
+                        'AM_ENABLE_SHARED' => 1,
177 
+                        'LTOPTIONS_VERSION' => 1,
178 
+                        '_LT_AC_LOCK' => 1,
179 
+                        'AC_LIBTOOL_FC' => 1,
180 
+                        'LT_LIB_M' => 1,
181 
+                        '_LT_AC_PROG_CXXCPP' => 1,
182 
+                        '_LT_AC_LANG_RC_CONFIG' => 1,
183 
+                        '_AM_SET_OPTIONS' => 1,
184 
+                        'AC_LTDL_SHLIBEXT' => 1,
185 
+                        'AC_WITH_LTDL' => 1,
186 
+                        'AC_LTDL_DLSYM_USCORE' => 1,
187 
+                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
188 
+                        'AC_DISABLE_SHARED' => 1,
189 
+                        'AC_PATH_TOOL_PREFIX' => 1,
190 
+                        'LT_OUTPUT' => 1,
191 
+                        'LT_WITH_LTDL' => 1,
192 
+                        'AC_PROG_LIBTOOL' => 1,
193 
+                        'AC_LIBLTDL_CONVENIENCE' => 1,
194 
+                        'AC_LIBTOOL_DLOPEN' => 1,
157 195 
                         'LTOBSOLETE_VERSION' => 1,
158 
-                        'LT_SUPPORTED_TAG' => 1,
159 
-                        'AC_ENABLE_SHARED' => 1,
160 
-                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
161 
-                        'AM_AUX_DIR_EXPAND' => 1,
162 196 
                         'AC_PROG_EGREP' => 1,
163 
-                        'AC_PROG_LD_GNU' => 1,
164 
-                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
165 
-                        '_LT_AC_TAGCONFIG' => 1,
166 197 
                         '_LT_CC_BASENAME' => 1,
167 
-                        'LTSUGAR_VERSION' => 1,
168 
-                        '_LT_AC_LANG_CXX' => 1,
169 
-                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
170 
-                        'LT_OUTPUT' => 1,
171 
-                        'm4_include' => 1,
172 
-                        'AC_LIBTOOL_SETUP' => 1,
173 
-                        'AC_PATH_MAGIC' => 1,
174 
-                        '_LT_AC_SYS_COMPILER' => 1,
175 
-                        'AM_ENABLE_SHARED' => 1,
176 
-                        '_LT_AC_LANG_C_CONFIG' => 1,
177 
-                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
178 
-                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
179 
-                        '_AM_PROG_TAR' => 1,
180 
-                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
181 
-                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
182 
-                        'AC_PATH_TOOL_PREFIX' => 1,
183 
-                        '_LT_LINKER_OPTION' => 1,
184 
-                        '_LT_AC_LOCK' => 1,
185 
-                        'AC_LTDL_SYMBOL_USCORE' => 1,
186 
-                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
187 
-                        'AM_DISABLE_SHARED' => 1,
188 
-                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
189 
-                        'AC_LIBTOOL_WIN32_DLL' => 1,
190 
-                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
191 
-                        'LT_SYS_MODULE_PATH' => 1,
192 
-                        'LT_AC_PROG_SED' => 1,
198 
+                        'm4_pattern_forbid' => 1,
199 
+                        'AC_LIBTOOL_OBJDIR' => 1,
200 
+                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
193 201 
                         'AC_LIBLTDL_INSTALLABLE' => 1,
194 
-                        'AM_RUN_LOG' => 1,
195 
-                        '_LT_PROG_FC' => 1,
196 
-                        '_LT_WITH_SYSROOT' => 1,
197 
-                        'AM_PROG_LIBTOOL' => 1,
198 
-                        'AC_LIBLTDL_CONVENIENCE' => 1,
199 
-                        'include' => 1,
200 202 
                         'AC_DEFUN_ONCE' => 1,
201 
-                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
202 
-                        '_LT_AC_SHELL_INIT' => 1,
203 
-                        '_AM_MANGLE_OPTION' => 1,
204 
-                        'LT_WITH_LTDL' => 1,
205 
-                        '_AM_CONFIG_MACRO_DIRS' => 1,
206 
-                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
207 
-                        'AM_SILENT_RULES' => 1,
208 
-                        'AC_LTDL_SYSSEARCHPATH' => 1,
209 
-                        'AC_CONFIG_MACRO_DIR' => 1,
210 
-                        '_LT_LIBOBJ' => 1,
211 
-                        '_LT_AC_PROG_CXXCPP' => 1,
212 
-                        'AC_PROG_LD' => 1,
213 
-                        'LT_LANG' => 1,
214 
-                        'LT_FUNC_DLSYM_USCORE' => 1,
215 
-                        'LT_SYS_DLOPEN_DEPLIBS' => 1,
216 
-                        'LT_CONFIG_LTDL_DIR' => 1,
217 
-                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
218 
-                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
203 
+                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
204 
+                        'LT_LIB_DLLOAD' => 1,
205 
+                        'AM_RUN_LOG' => 1,
206 
+                        'AC_LTDL_ENABLE_INSTALL' => 1,
207 
+                        '_LT_REQUIRED_DARWIN_CHECKS' => 1,
208 
+                        '_LT_LINKER_BOILERPLATE' => 1,
209 
+                        'AC_PROG_LD_RELOAD_FLAG' => 1,
219 210 
                         'AM_SANITY_CHECK' => 1,
220 
-                        'AM_CONDITIONAL' => 1,
221 
-                        'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
222 
-                        'AC_LIBTOOL_CXX' => 1
211 
+                        'LT_CONFIG_LTDL_DIR' => 1,
212 
+                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
213 
+                        'AC_CONFIG_MACRO_DIR' => 1,
214 
+                        'AM_ENABLE_STATIC' => 1,
215 
+                        'AM_INIT_AUTOMAKE' => 1,
216 
+                        'AC_LIBTOOL_CXX' => 1,
217 
+                        'LT_SYS_MODULE_EXT' => 1,
218 
+                        '_AM_SET_OPTION' => 1,
219 
+                        'AM_PROG_LD' => 1,
220 
+                        '_LT_AC_LANG_GCJ' => 1,
221 
+                        'AM_PROG_LIBTOOL' => 1,
222 
+                        'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1
223 223 
                       }
224 224 
                     ], 'Autom4te::Request' ),
225 225 
              bless( [
... ... 
@@ -234,65 +234,65 @@
234 234 
                         'configure.ac'
235 235 
                       ],
236 236 
                       {
237 
-                        'AC_SUBST_TRACE' => 1,
238 
-                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
239 
-                        'AM_INIT_AUTOMAKE' => 1,
237 
+                        '_AM_SUBST_NOTMAKE' => 1,
238 
+                        'AC_DEFINE_TRACE_LITERAL' => 1,
239 
+                        'AC_CONFIG_HEADERS' => 1,
240 
+                        'AM_SILENT_RULES' => 1,
241 
+                        'AC_CONFIG_LINKS' => 1,
242 
+                        '_AM_COND_IF' => 1,
243 
+                        '_AM_MAKEFILE_INCLUDE' => 1,
244 
+                        'AC_LIBSOURCE' => 1,
245 
+                        'AM_PROG_CC_C_O' => 1,
240 246 
                         'AC_REQUIRE_AUX_FILE' => 1,
241 
-                        'include' => 1,
242 
-                        'm4_pattern_allow' => 1,
243 
-                        'AM_GNU_GETTEXT' => 1,
244 
-                        'AC_INIT' => 1,
245 
-                        'AC_CANONICAL_SYSTEM' => 1,
247 
+                        'sinclude' => 1,
248 
+                        'm4_include' => 1,
249 
+                        'AM_INIT_AUTOMAKE' => 1,
250 
+                        'AC_CONFIG_AUX_DIR' => 1,
251 
+                        'AM_PROG_AR' => 1,
252 
+                        'AH_OUTPUT' => 1,
253 
+                        'AC_CONFIG_FILES' => 1,
254 
+                        'LT_CONFIG_LTDL_DIR' => 1,
255 
+                        'AM_CONDITIONAL' => 1,
246 256 
                         'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
257 
+                        'AM_ENABLE_MULTILIB' => 1,
258 
+                        'AC_CANONICAL_SYSTEM' => 1,
259 
+                        'AM_PROG_CXX_C_O' => 1,
260 
+                        'AC_FC_FREEFORM' => 1,
261 
+                        'AM_PROG_FC_C_O' => 1,
262 
+                        'AC_FC_PP_SRCEXT' => 1,
263 
+                        'include' => 1,
247 264 
                         'AM_PROG_MOC' => 1,
248 
-                        'AM_NLS' => 1,
265 
+                        'AC_INIT' => 1,
266 
+                        'AM_XGETTEXT_OPTION' => 1,
249 267 
                         'AM_MAINTAINER_MODE' => 1,
250 
-                        'AM_PATH_GUILE' => 1,
251 
-                        'AM_SILENT_RULES' => 1,
252 
-                        'AM_ENABLE_MULTILIB' => 1,
253 
-                        'AC_DEFINE_TRACE_LITERAL' => 1,
254 
-                        'AM_AUTOMAKE_VERSION' => 1,
255 
-                        'AC_FC_SRCEXT' => 1,
256 
-                        'AC_SUBST' => 1,
268 
+                        'AM_NLS' => 1,
257 269 
                         'm4_pattern_forbid' => 1,
258 
-                        '_AM_MAKEFILE_INCLUDE' => 1,
270 
+                        'AC_CANONICAL_BUILD' => 1,
271 
+                        'AM_GNU_GETTEXT' => 1,
272 
+                        'm4_pattern_allow' => 1,
273 
+                        'AM_PROG_MKDIR_P' => 1,
274 
+                        'AM_AUTOMAKE_VERSION' => 1,
275 
+                        'AC_FC_PP_DEFINE' => 1,
259 276 
                         'm4_sinclude' => 1,
260 
-                        '_m4_warn' => 1,
261 
-                        'AM_PROG_CXX_C_O' => 1,
277 
+                        'AM_MAKEFILE_INCLUDE' => 1,
278 
+                        'AM_POT_TOOLS' => 1,
279 
+                        'AC_CANONICAL_HOST' => 1,
280 
+                        'LT_INIT' => 1,
281 
+                        'AC_SUBST' => 1,
262 282 
                         '_AM_COND_ENDIF' => 1,
263 
-                        'LT_CONFIG_LTDL_DIR' => 1,
264 
-                        'AC_CONFIG_SUBDIRS' => 1,
265 
-                        'AC_FC_PP_SRCEXT' => 1,
266 
-                        'AM_PROG_FC_C_O' => 1,
267 
-                        'm4_include' => 1,
268 
-                        'AC_CONFIG_AUX_DIR' => 1,
269 
-                        'sinclude' => 1,
270 
-                        '_AM_SUBST_NOTMAKE' => 1,
271 
-                        '_AM_COND_ELSE' => 1,
272 
-                        'AC_FC_FREEFORM' => 1,
273 
-                        'AM_CONDITIONAL' => 1,
274 
-                        'AM_PROG_AR' => 1,
275 
-                        '_AM_COND_IF' => 1,
276 
-                        'AM_PROG_MKDIR_P' => 1,
283 
+                        'AC_CANONICAL_TARGET' => 1,
284 
+                        'AM_PATH_GUILE' => 1,
277 285 
                         'AC_CONFIG_LIBOBJ_DIR' => 1,
286 
+                        '_AM_COND_ELSE' => 1,
287 
+                        'AC_FC_SRCEXT' => 1,
288 
+                        '_LT_AC_TAGCONFIG' => 1,
289 
+                        '_m4_warn' => 1,
278 290 
                         'LT_SUPPORTED_TAG' => 1,
279 
-                        'AH_OUTPUT' => 1,
280 
-                        'AM_PROG_CC_C_O' => 1,
281 
-                        'AM_POT_TOOLS' => 1,
282 
-                        'AC_CONFIG_HEADERS' => 1,
283 
-                        'AC_CANONICAL_TARGET' => 1,
284 
-                        'LT_INIT' => 1,
291 
+                        'AC_SUBST_TRACE' => 1,
292 
+                        'AM_EXTRA_RECURSIVE_TARGETS' => 1,
285 293 
                         'AC_PROG_LIBTOOL' => 1,
286 
-                        '_LT_AC_TAGCONFIG' => 1,
287 
-                        'AM_PROG_F77_C_O' => 1,
288 
-                        'AC_CONFIG_LINKS' => 1,
289 
-                        'AM_XGETTEXT_OPTION' => 1,
290 
-                        'AC_CANONICAL_BUILD' => 1,
291 
-                        'AC_CANONICAL_HOST' => 1,
292 
-                        'AC_FC_PP_DEFINE' => 1,
293 
-                        'AC_CONFIG_FILES' => 1,
294 
-                        'AC_LIBSOURCE' => 1,
295 
-                        'AM_MAKEFILE_INCLUDE' => 1
294 
+                        'AC_CONFIG_SUBDIRS' => 1,
295 
+                        'AM_PROG_F77_C_O' => 1
296 296 
                       }
297 297 
                     ], 'Autom4te::Request' )
298 298 
            );