1 2003-09-05 Paul Eggert <eggert@twinsun.com>
3 * NEWS, aclocal.in, automake.in, automake.texi, lib/ansi2knr.c,
4 lib/depcomp, lib/missing, lib/py-compile,
5 lib/Automake/Channels.pm, lib/Automake/Rule.pm,
6 lib/Automake/Variable.pm, lib/Automake/tests/Condition.pl,
7 lib/am/dejagnu.am, lib/am/depend.am, lib/am/lisp.am,
8 lib/am/remake-hdr.am, lib/am/texi-vers.am, m4/obsolete.m4,
9 m4/python.m4, tests/backsl4.test, tests/defs.in,
10 tests/dejagnu7.test, tests/depacl2.test, tests/dirlist.test,
11 tests/error.test, tests/getopt.test, tests/gnuwarn.test,
12 tests/include2.test, tests/libobj10.test, tests/libtool5.test,
13 tests/libtool6.test, tests/lisp3.test, tests/phony.test,
14 tests/pr220.test, tests/subcond2.test, tests/subcond3.test,
16 Spelling and minor grammar fixes.
18 2003-09-01 Alexandre Duret-Lutz <adl@gnu.org>
20 * lib/config.sub, lib/config.guess, lib/texinfo.tex,
21 lib/config-ml.in, lib/symlink-tree: New upstream versions.
23 2003-08-31 Thien-Thi Nguyen <ttn@gnu.org> (tiny change)
25 * tests/yacc7.test: Require bison.
27 2003-08-31 Alexandre Duret-Lutz <adl@gnu.org>
29 * aclocal.in (scan_file): Warn about underquoted AC_DEFUN.
30 ($underquoted_manual_once): New variable.
31 * automake.texi (Extending aclocal): Document this.
33 2003-08-29 Alexandre Duret-Lutz <adl@gnu.org>
35 * aclocal.in (@file_order): New variable, to make sure
36 files are output in the opposite order of the -I arguments.
38 (trace_used_macros, write_aclocal): Use it.
39 (scan_m4_files): Reverse the directory contents, so that
40 macros from the lexicographically greatest files are preferred.
41 * tests/aclocal9.test, tests/acloca10.test, tests/acloca11.test:
43 * tests/Makefile.am (TESTS): Add them.
45 2003-08-24 Alexandre Duret-Lutz <adl@gnu.org>
47 For Debian Bug #206299:
48 * automake.in ($configure_deps_greatest_timestamp,
49 $output_deps_greatest_timestamp): New variables.
50 (initialize_per_input): Reset $output_deps_greatest_timestamp.
51 (scan_autoconf_traces, scan_autoconf_files, read_am_file):
52 Update $configure_deps_greatest_timestamp and
53 $output_deps_greatest_timestamp
54 (generate_makefile): Rewrite the logic to decide whether
55 to rewrite the output. Move the leading dup_channel_setup
56 and trailing drop_channel_setup to MAIN, so that
57 drop_channel_setup is executed for all exit paths.
58 * tests/aclocal7.test: Update to check for $AUTOMAKE --no-force
59 * tests/distcom6.test: New file. Report from Scott James Remnant.
60 * tests/Makefile.am (TESTS): Add distcom6.test.
62 * configure.in: Require Autoconf 2.57b to be sure
63 aclocal can use autom4te --language Autoconf-without-aclocal-m4.
64 * m4/init.m4: Likewise. Move the AC_PREREQ and m4_pattern_allow
65 calls inside the AM_INIT_AUTOMAKE macro.
66 * m4/auxdir.m4, m4/cond.m4, m4/lex.m4, m4/regex.m4: Move
67 AC_PREREQ calls inside the macros.
68 * m4/header.m4: Remove AC_PREREQ.
70 * automake.in (file_contents_internal): Do not add newlines before
73 * aclocal.in (write_aclocal): Take an output file and list of
74 used macros in arguments and make up the file contents here.
75 (trace_used_macros): New function.
76 (add_file): Do not update $output.
78 (MAIN): Call trace_used_macros. Then rewrite aclocal.m4 only
79 for these traced macros. This should shorten aclocal.m4 by
80 stripping out unused macros.
81 * automake.texi (Invoking aclocal): Document ${AUTOM4TE}.
82 * tests/aclibobj.test: Make sure configure.in exists by the time
84 * tests/aclocal8.test: New file.
85 * tests/Makefile.am (TESTS): Add aclocal8.test.
86 Suggested by Bruno Haible and Akim Demaille.
88 2003-08-21 Akim Demaille <akim@epita.fr>
90 * lib/Automake/Configure_ac.pm (&find_configure_ac)
91 (&require_configure_ac): Accept an optional directory argument.
92 ($configure_ac): Remove.
93 * aclocal.in, automake.in ($configure_ac): New.
94 * lib/Automake/Variable.pm: Don't use $configure_ac, just
97 2003-08-20 Akim Demaille <akim@epita.fr>
99 * lib/Automake/FileUtils.pm: More perldoc.
100 (&up_to_date_p): New.
102 2003-08-17 Alexandre Duret-Lutz <adl@gnu.org>
104 Fix for PR automake/398:
105 * m4/python.m4: Do not call AC_PATH_PROGS if $PYTHON is already
106 set. Display `none' instead of `:' and $PYTHON is set to `:'
107 when no suitable interpreter is found. Honor ACTION-IF-FOUND and
109 * automake.texi (Python): Document ACTION-IF-FOUND and
111 * tests/python4.test, tests/python5.test, tests/python6.test,
112 tests/python7.test, tests/python8.test, tests/python9.test: New
114 * tests/Makefile.am (TESTS): Add them.
115 Report from Per Cederqvist.
117 2003-08-13 Alexandre Duret-Lutz <adl@gnu.org>
119 Fix for PR automake/399:
120 * m4/python.m4: Use AC_PATH_PROGS, not AC_PATH_PROG.
121 Report from Per Cederqvist.
123 2003-08-12 Raja R Harinath <harinath@acm.org>
125 * lib/Automake/Condition.pm (strip): Replace loop with 'grep'.
126 (not): Replace loop with 'map'.
127 * lib/Automake/DisjConditions.pm (sub_conditions): Likewise.
128 * lib/Automake/Item.pm (not_alwasy_defined_in_cond):
129 Don't 'simplify' result of 'invert', since it's already in
131 * lib/Automake/Rule.pm (define): Replace loop with
132 'not_always_defined_in_cond'.
134 * lib/Automake/DisjConditions.pm (ambiguous_p): Typo in comment.
135 * lib/Automake/Rule.pm (accept_extensions, msg_cond_rule): Likewise.
136 (define): Reword comment slightly.
137 * Variable.pm (_var_order, msg_cond_var): Typo in comment.
138 * tests/cond20.test (var2): Use foo.c instead of foo.cc to avoid
139 spurious automake error exit.
141 2003-08-12 Alexandre Duret-Lutz <adl@gnu.org>
143 * lib/Automake/Item.pm, lib/Automake/ItemDef.pm: New files.
144 * lib/Automake/Rule.pm, lib/Automake/RuleDef.pm: New files.
145 * lib/Automake/Makefile.am (dist_perllib_DATA): Add them.
146 * lib/Automake/VarDef.pm: Make this a subclass of Automake::ItemDef.
147 (new): Adjust to call Automake::ItemDef::new.
148 (comment, location, owner): Delete. Now inherited from ItemDef.
149 * lib/Automake/Variable.pm: Make this a subclass of Automake::Item.
150 (_new): Adjust to call Automake::Item::new.
151 (name, def, rdef, _set, conditions, not_always_defined_in_cond):
152 Delete. How inherited from Item, where `_set' is called `set'.
153 * automake.in (SUFFIX_RULE_PATTERN): Delete. Now in Automake::Rule.
154 (suffix_rules_default): Delete. Now
155 Automake::Rule::_suffix_rules_default
156 (suffixes): Delete. Now Automake::Rule::suffixes.
157 (TARGET_AUTOMAKE, TARGET_USER): Delete. Now
158 Automake::RuleDef::RULE_AUTOMAKE and Automake::RuleDef::RULE_USER.
159 (%targets, %target_source, %target_name, %target_owner): Delete,
160 replaced by the Rule and RuleDef classes.
161 (dependencies, depend, actions): Delete. Now in Automake::Rule.
162 (suffix_rules, register_suffix_rule): Likewise.
163 (KNOWN_EXTENSIONS_PATTERN, accept_extensions): Likewise.
164 (known_extensions_list): Delete. Now
165 Automake::Rule::_known_extensions_list.
166 (target_conditions): Delete. Now inherited by Automake::Rule
167 from Automake::Item::conditions.
168 (rule_define): Delete. Now Automake::Rule::define. Adjust all
170 (target_defined): Delete. Now Automake::Rule::rule. Adjust all
172 (initialize_per_input): Adjust to call Automake::Rule::reset.
173 (err_target, err_cond_target, msg_cond_target, msg_target,
174 reject_target): Delete. Now defined in Automake::Rule as
175 err_rule, err_cond_rule, msg_cond_rule, msg_rule and reject_target.
177 (handle_languages): Call suffix_rules_count.
178 * tests/location.test: Adjust expected diagnostics. We now display
179 $(EXEEXT) accurately.
181 2003-08-10 Alexandre Duret-Lutz <adl@gnu.org>
183 Revert the fix for PR automake/291:
184 * lib/Automake/Variable.pm (define): Do not warn about variables
185 starting with `_' which are an issue on NEWS-OS 4.2R. According
186 to Paul Eggert, NEWS-OS 4.2R is ten years old, the latest version
187 was released on 1996 and is not in wide use. On the other hand,
188 variables starting with `_' are mandatory in several situations,
189 so diagnosing them is more annoying than useful.
190 * tests/canon5.test: Do not use -Wno-portability.
191 * tests/vars2.test: Delete.
192 * tests/Makefile.am (TESTS): Remove vars2.test.
193 Suggested by Jim Meyering.
195 2003-08-09 Raja R Harinath <harinath@acm.org>
197 * lib/Automake/DisjConditions.pm (ambiguous_p): Simplify slightly.
198 * lib/Automake/tests/DisjConditions.pl (test_ambig): Test
199 Automake::Disjunctions::ambiguous_p.
201 2003-08-07 Alexandre Duret-Lutz <adl@gnu.org>
203 * lib/Automake/Variable.pm (condition_ambiguous_p): Move ...
204 * lib/Automake/DisjConditions.pm (ambiguous_p): ... here.
205 * automake.in (rule_define): Adjust usage.
206 * lib/Automake/Variable.pm (_check_ambiguous_condition): Likewise.
208 * lib/Automake/Options.pm: New file.
209 * lib/Automake/Makefile.am (dist_perllib_DATA): Add Options.pm.
210 * automake.in (FOREIGN, GNU, GNITS, $default_strictness)
211 ($default_strictness_name, $strictness, $strictness_name)
212 (%options, %global_options, process_option_list)
213 (set_strictness): Remove, now in Options.pm.
214 (initialize_per_input): Call Automake::Options::reset.
215 (handle_options, get_object_extension, get_object_extension)
216 (handle_languages, handle_single_transform_list, handle_compile)
217 (handle_texinfo_helper, handle_man_pages, handle_dist)
218 (handle_configure, do_check_merge_target)
219 (handle_factored_dependencies, handle_tests)
220 (handle_minor_options, scan_autoconf_traces, check_cygnus)
221 (lang_sub_obj, lang_c_rewrite, lang_c_finish, rule_define)
222 (make_paragraphs, am_install_var, parse_arguments): Adjust
223 to set and read options via the new interface.
225 2003-08-07 Raja R Harinath <harinath@acm.org>
227 * Makefile.am (maintainer-check): Update perllibdir.
228 * lib/Automake/Makefile.am (Config.pm): Depend on Makefile too.
229 (EXTRA_DIST): Add Config.in.
230 * Makefile.in, lib/Automake/Makefile.in: Regenerate.
231 * tests/defs.in (AUTOMAKE, ACLOCAL): Use absolute paths in
234 2003-08-06 Raja R Harinath <harinath@acm.org>
236 * configure.in (AUTOMAKE, ACLOCAL): Search the 'lib' directory
237 from the builddir too, to pick up Automake::Config.
238 * tests/defs.in (AUTOMAKE, ACLOCAL): Likewise.
239 * configure: Regenerate.
240 * automake.in (BEGIN): Handle multiple directories in $perllibdir.
241 * aclocal.in (BEGIN): Likewise.
243 2003-08-07 Alexandre Duret-Lutz <adl@gnu.org>
245 * tests/ltcond.test: Thinko.
247 2003-08-06 Alexandre Duret-Lutz <adl@gnu.org>
249 * lib/Automake/Config.in: New file.
250 * lib/Automake/Makefile.am (nodist_perllib_DATA, do_subst,
251 CLEANFILES): New variables.
252 (Config.pm): New rule.
253 * Makefile.am (maintainer-check): Adjust expected differences
254 between automake.in and automake.
255 * aclocal.in, automake.in: Use Automake::Config.
257 2003-08-05 Alexandre Duret-Lutz <adl@gnu.org>
259 * tests/ltconv.test: s/rm/rm -f/ to placate maintainer-check.
261 * automake.in (handle_texinfo_helper): Use the user definition
262 of TEXINFO_TEX before checking for cygnus or AC_CONFIG_AUX_DIR.
263 * tests/txinfo22.test: New file.
264 * tests/Makefile.am (TESTS): Add txinfo22.test.
265 Report from Tom Tromey.
267 2003-08-03 Raja R Harinath <harinath@acm.org>
269 * lib/Automake/Variable.pm (@EXPORT): Remove
270 traverse_variable_recursively and
271 require_variables_for_variable.
272 (require_variables_for_variable, traverse_variable_recursively)
273 (_traverse_variable_recursively_worker): Convert to
274 Automake::Variable methods, remove support for being
275 invoked with variable names, and rename to ...
276 (requires_variables, traverse_recursively)
277 (_do_recursive_traversal): ... these.
278 (_value_as_list_recursive_worker, transform_variable_recursively):
279 Update to reflect changes.
280 * automake.in (handle_LIBOBJS, handle_ALLOCA)
281 (handle_libraries, handle_ltlibraries, am_primary_prefixes):
283 (define_objects_from_sources): Fix typo in comment.
285 2003-08-02 Raja R Harinath <harinath@acm.org>
287 * automake.in (handle_source_transform): Replace 'grep' with 'map'.
288 (register_language): Replace 'grep' with 'foreach' modifier.
290 2003-08-01 Raja R Harinath <harinath@acm.org>
292 * lib/Automake/Variables.pm (variables): Return a list of
293 Automake::Variable instances, not a list of strings.
294 (dump): Remove support for being invoked with a string.
295 (variables_dump): Adapt to these changes.
296 * automake.in (check_typos): Likewise.
297 (am_primary_prefixes): Likewise.
299 2003-07-31 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> (tiny change)
301 * lib/depcomp (aix): Support AIX Compiler version 6.
303 2003-07-31 Alexandre Duret-Lutz <adl@gnu.org>
305 * automake.texi (A Shared Library): Rewrite and split into
306 subsections. Valuable comments from Norman Gray, Harlan Stenn,
307 Tim Van Holder, and Guido Draheim.
308 * tests/ltcond.test, tests/ltcond2.test, tests/ltconv.test: New files.
309 * tests/Makefile.am (TESTS): Add them.
311 2003-07-30 Alexandre Duret-Lutz <adl@gnu.org>
313 * automake.in (handle_single_transform_list): Complain about
314 foo.$(OBJEXT) being created both with libtool and without, not
316 Report from Tim Van Holder.
318 2003-07-29 Alexandre Duret-Lutz <adl@gnu.org>
320 * Makefile.am (FETCHFILES, fetch): Add config-ml.in and
322 * lib/config.sub, lib/config-ml.in, lib/texinfo.tex: New
325 2003-07-28 Alexandre Duret-Lutz <adl@gnu.org>
327 * automake.in (handle_configure): Cosmetic change to avoid
328 a maintainer-check complaint.
330 2003-07-27 Alexandre Duret-Lutz <adl@gnu.org>
332 * lib/Automake/Variable.pm (@EXPORT): Remove variable_dump.
333 (variable_dump): Replace by ...
334 (dump): ... this method.
335 (rdef, _check_ambiguous_condition): Adjust to use ->dump.
336 (define, variables_dump): Adjust to use Automake::Variable::dump
338 * lib/am/compile.am (mostlyclean-compile): Do not erase core dumps.
339 * automake.texi (Built sources example): Adjust example.
341 2003-07-26 Alexandre Duret-Lutz <adl@gnu.org>
343 * automake.in (get_object_extension, handle_languages)
344 (handle_single_transform_list, handle_compile, handle_compile)
345 (handle_texinfo_helper, handle_texinfo_helper, handle_man_pages)
346 (handle_tests, handle_minor_options, check_gnu_standards)
347 (lang_sub_obj, lang_c_rewrite, lang_c_finish, rule_define):
348 Simplify "if (defined $options{'X'})" into "if ($options{'X'})".
350 Complete changes from 2003-07-08.
351 * automake.in ($cmdline_use_dependencies, $use_dependencies): Remove,
352 replaced by $options{'no-dependencies'}.
353 ($global_options): Remove.
354 (%global_options): New variable.
355 (initialize_per_input): Empty %options.
356 (process_option_list): Take a location and %options ref argument,
357 process no-dependencies as other options.
358 (handle_options): Do not reparse the global options, just initialize
359 %options from %global_options and fill it with local options.
360 (handle_languages, handle_single_transform_list)
361 (handle_configure, check_cygnus): Adjust usage of
362 $options{'no-dependencies'}.
363 (make_paragraphs): Adjust usage of $options{'cygnus'}.
364 (parse_arguments): Set cygnus and no-dependencies in %global_options.
365 (scan_autoconf_traces) <AM_INIT_AUTOMAKE>: Call process_option_list
366 to fill %global_options.
368 2003-07-25 Alexandre Duret-Lutz <adl@gnu.org>
370 * tests/remake4.test: Use `$MAKE distdir' instead of `$MAKE dist' to
371 avoid the use of tar.
373 2003-07-24 Alexandre Duret-Lutz <adl@gnu.org>
375 * tests/gnuwarn2.test: Typo.
377 * tests/insthook.test: Use $MAKE, not make.
379 Fix missing rebuilds during `make dist' with BSD make.
380 * automake.in (generate_makefile): Do not push Makefile.in, and
381 Makefile.am into DIST_COMMON here.
382 * lib/am/configure.am (DIST_COMMON): Do it here, and use
383 %MAKEFILE-AM% and %MAKEFILE-IN% so that items in DIST_COMMON
384 actually match the targets. Prefix `configure' with `$(srcdir)/'
386 * tests/remake4.test: New file.
387 * tests/Makefile.am (TESTS): Add remake4.test.
388 Report from Akim Demaille.
390 2003-07-23 Alexandre Duret-Lutz <adl@gnu.org>
392 * automake.in (handle_multilib): Register all-multi.
393 (file_contents_internal): Insert \n when concatenating actions
394 from "factored" rules.
395 * lib/config-ml.in: New file, from GCC, including a patch
396 from Ralf Corsepius (see GCC's PR 11526).
397 * lib/symlink-tree.in: New file, from GCC.
398 * lib/Makefile.am (dist_script_DATA): Add config-ml.in and
400 * lib/am/clean.am (distclean-generic): Do not delete Makefile here...
401 (distclean, maintainer-clean): ... do it here.
402 * lib/am/depend.am (distclean-depend): Likewise, replace by
403 (distclean, maintainer-clean): ... these.
404 * lib/am/multilib.am (all-recursive, install-recursive,
405 mostlyclean-recursive, clean-recursive, distclean-recursive,
406 maintainer-clean-recursive): Remove these rules.
407 (mostlyclean-am, clean-am, distclean-am, maintainer-clean-am): Replace
409 (mostlyclean, clean, distclean, maintainer-clean): ... these.
410 (all-am): Remove, done in handle_multilib.
411 (install-am): Replace by ...
412 (install-exec-am): ... this.
413 * tests/Makefile.am (TESTS): Add multlib.test.
414 * tests/multlib.test: New file, based on a test case by
417 2003-07-23 Tom Tromey <tromey@redhat.com>
419 * lib/missing (autom4te): Typo.
421 2003-07-16 Derek Price <derek@ximbiot.com>
423 * automake.in (scan_autoconf_traces): Handle AC_CONFIG_LINKS.
424 (handle_configure): Handle adding AC_CONFIG_LINKS arguments to
425 distclean targets (CONFIG_CLEAN_FILES makefile var).
426 * NEWS: Note new handling of AC_CONFIG_LINKS.
427 * automake.texi (Other things Automake recognizes): Ditto.
428 * tests/Makefile.am (TESTS): Add new tests.
429 * tests/conflnk.test: New test that links are cleaned on distclean.
430 * tests/conflnk2.test: New test that source files for links are
433 2003-07-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (tiny change)
435 * automake.in (scan_autoconf_traces): Trace AM_ENABLE_MULTILIB to
436 render $seen_multilib functional again.
438 2003-07-10 Raja R Harinath <harinath@cs.umn.edu>
440 Avoid using refs as hash keys.
441 * lib/Automake/Variable.pm ($_traversal): New.
442 (reset): Reset $_traversal.
443 (_new): New attribute 'scanned'.
444 (%_vars_scanned): Remove.
445 (traverse_variable_recursively)
446 (traverse_variable_recursively_worker):
447 Use $_traversal instead of %_vars_scanned to detect recursively
450 * lib/am/configure.am (am--refresh): Silence.
452 2003-07-10 Alexandre Duret-Lutz <adl@gnu.org>
454 * lib/Automake/Variable.pm (define): Make clear the diagnostic
455 about variable names starting with `_' is about *Make* variables.
457 For Debian Bug #193907:
458 * automake.texi (Clean): make maintainer-clean should still
459 allow ./configure && make to run.
461 * automake.texi (CVS): Typo.
463 2003-07-09 Alexandre Duret-Lutz <adl@gnu.org>
465 * aclocal.in: Use Automake::FileUtils.
466 (parse_arguments, scan_configure, scan_m4_files): Never call
467 "die" to print an error message. Use print and exit.
468 * automake.in: Use Automake::FileUtils.
469 * lib/Automake/General.pm ($debug, $help, $tmp, $verbose,
470 $version, &debug, &getopt, &mktmpdir, &verbose): Remove.
471 (END): Do not massage Perl's exit code. Do not clean any temporary
473 (find_file, mtime, update_file, xsystem, contents): Move to ...
474 * lib/Automake/FileUtils.pm: ... this new file. Adjust to
475 report errors using Channels.
476 (handle_exec_errors, xqx): New functions, from Autoconf.
477 * lib/Automake/Makefile.am (dist_perllib_DATA): Add FileUtils.pm.
479 * lib/Automake/Variable.pm (_traverse_variable_recursively_worker):
480 Return the empty list on recursively defined variable. This
481 supersedes my change of 2003-07-02.
483 2003-07-08 Akim Demaille <akim@epita.fr>
485 * automake.in ($cygnus_mode): Replace with $options{'cygnus'}.
486 Adjust all dependencies.
487 (&depend): Move next to %dependencies and prototype.
488 (&initialize_per_input): Initialize the 'cygnus' field of
489 '%options' to spare the code from 'exists' or 'defined' when
491 (&handle_configure, &do_check_merge_target, &check_cygnus): Prototype.
492 (&parse_arguments): Rename '%options' and '%options_1st_pass' as
493 '%cli_options' and '%cli_options_1st_pass' to avoid clashes and
496 2003-07-07 Alexandre Duret-Lutz <adl@gnu.org>
498 * automake.in (generate_makefile): Move near the end of the
499 file, after the definition of all called functions, so that
500 prototypes can be enforced.
502 2003-07-06 Akim Demaille <akim@epita.fr>
504 * lib/am/subdirs.am (RECURSIVE_TARGETS): Move install-recursive,
505 install-exec-recursive, install-data-recursive and
506 uninstall-recursive addition to...
507 * lib/am/texinfos.am: here.
508 * lib/am/texinfos.am, lib/am/subdirs.am: Remove the .PHONY
509 declaration of RECURSIVE_TARGETS.
511 2003-07-06 Akim Demaille <akim@epita.fr>
513 * lib/Automake/Variable.pm, lib/Automake/VarDef.pm (VAR_SORTED):
516 * automake.in (&handle_subdirs): Prototype.
518 Make RECURSIVE_TARGETS a VAR_SORTED.
520 2003-07-06 Akim Demaille <akim@epita.fr>
522 * automake.in (&define_files_variable): New.
523 (&handle_texinfo_helper): Move the handling of user variables from
525 (&handle_texinfo): here.
526 This is to balance the size of these functions, and to match the
527 convention of other _helper functions.
528 (&handle_texinfo_helper): Use &define_files_variable.
529 Move some code to use less variables.
530 Rename $info_cursor as $texi.
531 (&handle_texinfo): Do not call handle_texinfo_helper if there are
533 * lib/am/texinfos.am: Sort the occurrences of dvi, info, pdf, ps
535 Remove *-recursive targets from .PHONY, they are part of
536 $(RECURSIVE_TARGETS) anyway.
537 (install-info, mostlyclean-aminfo): Are .PHONY.
539 2003-07-05 Akim Demaille <akim@epita.fr>
541 * lib/am/distdir.am: Use ';' as a terminator, not a separator, for
542 sed complex commands, as required by NetBSD sed.
543 Reported by Patrick Welche.
545 2003-07-05 Alexandre Duret-Lutz <adl@gnu.org>
547 * lib/config.guess, lib/config.sub: New upstream version.
549 2003-07-04 Alexandre Duret-Lutz <adl@gnu.org>
551 * automake.texi (Optional, Dist): AC_CONFIG_AUX_DIR files
552 are automatically distributed.
554 * lib/depcomp (icc): Update to grok ICC 7.1's output.
555 * m4/depend.m4 (_AM_DEPENDENCIES): Check dependency generation
556 in a subdirectory, and with many dependencies. This
557 catches more failures of depcomp.
558 Reports from Ralf Wildenhues and Akim Demaille.
560 2003-07-04 Akim Demaille <akim@epita.fr>
562 * automake.in (&scan_texinfo_file, &output_texinfo_build_rules,
563 (&handle_texinfo_helper, &handle_texinfo): Formatting changes.
565 Don't use & when calling functions.
567 2003-07-03 Alexandre Duret-Lutz <adl@gnu.org>
569 * NEWS: Categorize entries.
570 Suggested by Jim Meyering.
572 * Makefile.am (maintainer-clean): Disallow '$AUTOMAKE && exit 1'.
573 Ignore @...@ substitutions in comments.
574 * tests/defs.in: Try to make the shell more POSIX compliant.
575 (AUTOMAKE_run, AUTOMAKE_fails): New functions.
576 * tests/README: Mention AUTOMAKE_fails.
577 * tests/alloca.test, tests/alloca2.test, tests/ansi8.test,
578 * tests/asm.test, tests/backsl3.test, tests/backsl4.test,
579 * tests/badline.test, tests/badopt.test, tests/canon.test,
580 * tests/canon5.test, tests/colneq.test, tests/comment3.test,
581 * tests/comment5.test, tests/cond2.test, tests/cond20.test,
582 * tests/cond23.test, tests/cond24.test, tests/cond27.test,
583 * tests/condinc2.test, tests/conff2.test, tests/cxx2.test,
584 * tests/dejagnu2.test, tests/dirforbid.test,
585 * tests/distcom3.test, tests/else.test, tests/exdir2.test,
586 * tests/exeext2.test, tests/gcj2.test, tests/gcj5.test,
587 * tests/getopt.test, tests/gettext.test, tests/gettext2.test,
588 * tests/gnits.test, tests/gnuwarn.test, tests/gnuwarn2.test,
589 * tests/insh.test, tests/lex2.test, tests/libobj10.test,
590 * tests/libobj12.test, tests/libobj13.test,
591 * tests/libobj3.test, tests/library2.test,
592 * tests/library3.test, tests/libtool4.test,
593 * tests/libtool6.test, tests/lisp2.test, tests/location.test,
594 * tests/nogzip2.test, tests/output5.test, tests/overrid.test,
595 * tests/percent.test, tests/percent2.test,
596 * tests/pluseq5.test, tests/pluseq7.test, tests/pluseq9.test,
597 * tests/pr211.test, tests/primary.test, tests/primary2.test,
598 * tests/python2.test, tests/recurs.test, tests/reqd2.test,
599 * tests/seenc.test, tests/specflg.test, tests/specflg2.test,
600 * tests/spell.test, tests/spell2.test, tests/srcsub.test,
601 * tests/srcsub2.test, tests/stdlib.test, tests/subdir7.test,
602 * tests/substtarg.test, tests/suffix11.test,
603 * tests/symlink.test, tests/syntax.test,
604 * tests/targetclash.test, tests/txinfo4.test,
605 * tests/version3.test, tests/warnopts.test,
606 * tests/xsource.test, tests/yacc2.test: Use set -e,
607 AUTOMAKE_fails, and always grep error message.
609 * automake.in (handle_ltlibraries): Fix call to msg.
611 * tests/stamph.test: Delete.
612 * tests/Makefile.am (TESTS): Remove stamph.test.
614 * automake.in (handle_single_transform_list): Use $var->name
615 to print variable in the configure-substitution diagnostic.
616 Do not mention the parent when it is the variable itself.
618 * tests/package.test: Delete.
619 * tests/Makefile.am (TESTS): Remove package.test.
621 * automake.in (cond_stack_else): Return FALSE if `if' was not
623 (cond_stack_endif): Return TRUE if `if' was not used. Do not
624 display $negate and $cond, they are irrelevant and maybe undefined.
626 2003-07-02 Alexandre Duret-Lutz <adl@gnu.org>
628 * lib/Automake/Variable.pm (_traverse_variable_recursively_worker):
629 Do not return undef when a variable is recursively defined, this
630 causes warnings all over the place. Return the empty string instead.
632 * lib/am/distdir.am (distcheck): Protect loop of DIST_ARCHIVES
633 from empty DIST_ARCHIVES.
635 2003-07-01 Alexandre Duret-Lutz <adl@gnu.org>
637 * automake.in (scan_autoconf_traces): Check the expected
638 number of arguments of each traced macro.
639 * tests/overrid.test: Fix call to AM_CONDITIONAL.
640 * tests/conff2.test: New files.
641 * tests/Makefile.am (TESTS): Add conff2.test.
642 Report from Paolo Bonzini.
644 2003-06-30 Alexandre Duret-Lutz <adl@gnu.org>
646 * automake.in ($SUBST_REF_PATTERN): Do not define.
647 (%gen_varname): Move to Variable.pm, as %_gen_varname.
648 (initialize_per_input): Do not clean %gen_varname.
649 (handle_options, check_libobjs_sources, handle_source_transform,
650 handle_LIBOBJS, handle_ltlibraries, handle_texinfo_helper,
651 handle_man_pages, handle_dist, handle_subdirs, handle_gettext,
652 am_install_var): Adjust to use value_as_list_recursive,
653 loc_and_value_as_list_recursive, and has_conditional_contents.
654 (require_file_with_macro): Accept an Automake::Variable as argument.
655 (traverse_variable_recursively,
656 traverse_variable_recursively_worker, gen_varname,
657 transform_variable_recursively): Move ...
658 * lib/Automake/Variable.pm (traverse_variable_recursively,
659 _traverse_variable_recursively_worker,
660 _gen_varname, transform_variable_recursively): ... here.
661 * automake.in (variable_conditionally_defined,
662 variable_value_as_list_recursive_worker,
663 variable_value_as_list_recursive
664 variable_loc_and_value_as_list_recursive): Move ...
665 * lib/Automake/Variable.pm (has_conditional_contents,
666 _value_as_list_recursive_worker,
667 value_as_list_recursive, loc_and_value_as_list_recursive): ... here.
668 (reset): Reset %_gen_varname.
669 (require_variables_for_variable): Accept an Automake::Variable
672 2003-06-27 Alexandre Duret-Lutz <adl@gnu.org>
674 * tests/aclocal6.test: Test maintainer-clean in VPATH
675 builds. (For Ralf's fix.)
677 2003-06-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (tiny change)
679 * lib/am/configure.am (maintainer-clean): Remove
680 $(top_srcdir)/autom4te.cache, not autom4te.cache.
682 2003-06-27 Akim Demaille <akim@epita.fr>
684 * automake.texi: Use @node with a single argument.
686 2003-06-27 Alexandre Duret-Lutz <adl@gnu.org>
688 * m4/Makefile.am (dist_m4data_DATA): Add $(top_srcdir)/m4/amversion.m4.
690 * lib/am/distdir.am (distcheck): Run $(am__remove_distdir)
691 at the end of distcheck. This was mistakenly removed on
693 * tests/subpkg.test: Make sure distcheck cleans up after itself.
695 * m4/Makefile.am ($(srcdir)/amversion.m4): Rename as ...
696 ($(top_srcdir)/m4/amversion.m4): ... this.
697 (DISTCLEANFILES): Remove.
698 (nodist_m4data_DATA): Remove. amversion.m4 is automatically
700 (EXTRA_DIST): Add amversion.in.
702 2003-06-25 Akim Demaille <akim@epita.fr>
704 * automake.texi (Top): Use @copying and @insertcopying.
705 Make Alexandre an author.
706 * automake.in ($gen_copyright): Add the "(C)" to Copyright.
707 * lib/depcomp: Likewise.
709 2003-06-23 Alexandre Duret-Lutz <adl@gnu.org>
711 * lib/Automake/Variable.pm (vardef, rvardef, set_seen): New functions.
712 (variable_defined, examine_variable): Remove.
713 (%_ac_macro_for_var): Add an entry for ALLOCA.
714 (require_variables): Use vardef instead of variable_defined.
716 * automake.in (generate_makefile): Do not push $(SOURCE) into
717 @sources. Use define_pretty_variable to define SOURCES.
718 (handle_LIBOBJS, handle_ALLOCA): Use require_variables_for_variable
719 to require LIBOBJS, LTLIBOBJS and ALLOCA.
720 (handle_programs, handle_ltlibraries): Do not define an empty
721 _DEPENDENCIES or _LDFLAGS variable when none is defined.
722 (define_configure_variable): Do not check whether the variable
723 already exists (it's Automake::Variable::define's job).
724 (require_build_directory): Likewise, do not check
725 the existence of am__dirstamp.
726 (generate_makefile, handle_options, handle_languages)
727 (check_libobjs_sources, handle_single_transform_list)
728 (traverse_variable_recursively_worker, handle_source_transform)
729 (handle_lib_objects, handle_LIBOBJS, handle_compile)
730 (handle_libtool, handle_programs, handle_libraries)
731 (handle_ltlibraries, check_typos, handle_texinfo_helper)
732 (handle_man_pages, handle_tags, handle_dist, handle_subdirs)
733 (scan_aclocal_m4, handle_gettext, handle_footer, handle_install)
734 (handle_all, do_check_merge_target, handle_clean, lang_c_finish)
735 (handle_tests, lang_yacc_target_hook, define_pretty_variable)
736 (define_compiler_variable, define_linker_variable)
737 (make_paragraphs, am_primary_prefixes, am_install_var): Adjust to
738 call var, vardef, or set_seen, instead of variable_defined. Use
739 set_seen only for variables which are actually checked by
741 * tests/target.test: Delete.
742 * tests/alloca.test, tests/alloca2.test: New files.
743 * tests/libobj3.test: Check error message.
744 * tests/distcom4.test: Make sure configure is in DIST_COMMON.
745 This replace confdist.test.
746 * tests/Makefile.am (TESTS, XFAIL_TESTS): Remove target.test.
747 (TESTS): Add alloca.test and alloca2.test. Remove confdist.test.
749 2003-06-20 Alexandre Duret-Lutz <adl@gnu.org>
751 * automake.in (handle_dist): Delete DIST_COMMON before redefining
752 it. Bug report from Akim Demaille.
753 (rewrite_inputs_into_dependencies): Make sure we always return
754 something, even when $add_srcdir is 0.
755 * tests/distcom4.test, tests/distcom5.test: New files.
756 * tests/Makefile.am (TESTS): Add distcom4.test and distcom5.test.
758 * tests/cond29.test: Also check for _SOURCES.
759 Report from Paolo Bonzini.
761 2003-06-20 Akim Demaille <akim@epita.fr>
763 * lib/am/configure.am: Replace leading spaces with a real tab.
765 2003-06-15 Alexandre Duret-Lutz <adl@gnu.org>
767 * tests/nogzip.test, tests/nogzip2.test: New files.
768 * tests/Makefile.am (TESTS): Add nogzip.test and nogzip2.test
770 2003-06-15 Akim Demaille <akim@epita.fr>
772 * automake.in (&make_paragraphs): Define %GZIP%.
773 (&process_option_list): Accept no-dist-gzip2.
774 (&handle_dist): Complain when no archive format is enabled.
775 * lib/am/distdir.am (DIST_ARCHIVES): New variable.
776 (dist-gzip, dist-bzip2, dist-tarZ, dist-zip): No longer
778 (dist): Build $(distdir).tar.gz conditionally.
779 (distcheck): Use DIST_ARCHIVES to find an archive to unpack, and
780 to list built archives. Run $(MAKE) dist instead of dist-gzip.
781 * automake.texi (Options, The types of distributions): Adjust.
783 2003-06-15 Jens Elkner <elkner@imsgroup.de> (tiny change)
785 * m4/lispdir.m4 (AM_PATH_LISPDIR): Fix sed commands to work with
788 2003-06-14 Karl Berry <karl@gnu.org>
789 Alexandre Duret-Lutz <adl@gnu.org>
791 * mkinstalldirs (scriptversion): New variable. Setup emacs hooks
792 to update it each time the file is written, as in install-sh.
793 (usage): Improve message.
794 (--version): New option.
795 (--help): Output to stdout, not stderr.
797 2003-06-13 Paul Eggert <eggert@twinsun.com>
799 * lib/install-sh (dsttmp, rmtmp): Do not use '#' in file names;
800 it's not guaranteed by POSIX and it doesn't work on OpenVMS.
801 Bug reported by Bernard Giroud in:
802 http://mail.gnu.org/archive/html/autoconf-patches/2003-06/msg00013.html
804 2003-06-05 Alexandre Duret-Lutz <adl@gnu.org>
806 * automake.in (check_gnu_standards): Use no-installman and
807 no-installinfo's locations.
808 (process_option_list): Fill %options with locations.
809 (check_cygnus) Fill $options{'no-installinfo'} and
810 $options{'no-dependencies'} with $cygnus_mode, so that it
812 * tests/gnuwarn2.test: New file.
813 * tests/Makefile.am (TESTS): Add gnuwarn2.test.
815 2003-06-04 Alexandre Duret-Lutz <adl@gnu.org>
817 * automake.in (process_option_list): Record the location
818 of ansi2knr's definition.
819 (handle_compile): Use it.
820 * tests/ansi3.test: Make sure the location appears correctly.
821 Update to use set -e.
822 * tests/ansi3b.test: New file.
823 * tests/Makefile.am (TESTS): Add ansi3b.test.
825 * tests/alpha.test: Really run $MAKE. Augment to test
826 subdirectories, and check-news report.
827 * tests/alpha2.test: New file. Bug report from Akim Demaille.
828 * tests/gnits2.test: Make sure README-alpha is not distributed.
829 * tests/Makefile.am (TESTS): Add alpha2.test.
830 * automake.in (handle_minor_options): Distribute README-alpha
831 using push_dist_common, not require_file_with_macro.
833 2003-06-03 Alexandre Duret-Lutz <adl@gnu.org>
835 * lib/Automake/Configure_ac.pm
836 (search_configure_ac, find_configure_ac): Rename as ...
837 (find_configure_ac, require_configure_ac): ... these.
838 * aclocal.in (scan_configure): Adjust call to require_configure_ac.
839 * automake.in (scan_autoconf_files): Likewise.
840 Suggested by Tim Van Holder.
842 * alocal.in: Use Automake::Configure_ac.
843 ($configure_ac): Delete.
844 (scan_configure): Adjust use of find_configure_ac;
845 * automake.in: Use Automake::Configure_ac.
846 ($configure_ac): Delete.
847 (scan_autoconf_files): Adjust use of find_configure_ac;
848 * lib/Automake/Configure_ac.pm: New file.
849 * lib/Automake/General.pm (find_configure_ac): Delete. Now
850 replaced by Automake::Configure_ac::search_configure_ac.
851 * lib/Automake/Makefile.am (dist_perllib_DATA): Add Configure_ac.pm.
852 * lib/Automake/Variable.pm: Use Automake::Configure_ac.
853 (require_variables): Adjust use of $configure_ac.
855 2003-06-02 Akim Demaille <akim@epita.fr>
857 * lib/am/texi-vers.am, lib/am/subdirs.am, lib/am/scripts.am,
858 * lib/am/remake-hdr.am, lib/am/python.am, lib/am/progs.am,
859 * lib/am/program.am, lib/am/multilib.am, lib/am/mans.am,
860 * lib/am/mans-vars.am, lib/am/ltlibrary.am, lib/am/ltlib.am,
861 * lib/am/lisp.am, lib/am/libtool.am, lib/am/library.am,
862 * lib/am/lang-compile.am, lib/am/java.am, lib/am/header.am,
863 * lib/am/header-vars.am, lib/am/footer.am, lib/am/depend.am,
864 * lib/am/dejagnu.am, lib/am/data.am, lib/am/compile.am,
865 * lib/am/clean.am, lib/am/clean-hdr.am, lib/am/check.am,
866 * lib/am/ansi2knr.am, lib/am/Makefile.am, lib/Makefile.am,
867 * m4/strip.m4, m4/sanity.m4, m4/runlog.m4, m4/regex.m4,
868 * m4/python.m4, m4/protos.m4, m4/options.m4, m4/obsolete.m4,
869 * m4/obsol-lt.m4, m4/obsol-gt.m4, m4/multi.m4, m4/missing.m4,
870 * m4/minuso.m4, m4/maintainer.m4, m4/lispdir.m4, m4/lex.m4,
871 * m4/install-sh.m4, m4/header.m4, m4/gcj.m4, m4/dmalloc.m4,
872 * m4/depout.m4, m4/cond.m4, m4/ccstdc.m4, m4/auxdir.m4, m4/as.m4,
873 * m4/Makefile.am: White space changes and Copyright updates.
875 2003-05-29 Alexandre Duret-Lutz <adl@gnu.org>
877 * lib/Automake/Variable.pm (check_defined_unconditionally): Add
878 the $parent_cond argument.
879 (output): Use $self->name in diagnostic not $self.
880 (variable_value_as_list): Rename as ...
881 (value_as_list): ... this. Declare as a method. Take a $parent_cond
882 argument and pass it to check_defined_unconditionally. Do not call
883 variable_assert, now that this is a method.
884 (variable_assert): Delete (unused).
885 * automake.in (traverse_variable_recursively_worker): Adjust to
886 use check_defined_unconditionally and value_as_list as a methods.
888 * lib/Automake/Variable.pm (output): Declare as a method, since it
889 is only used this way.
890 (define): Fix documentation of $cond.
891 Suggested by Raja R. Harinath.
893 2003-05-25 Alexandre Duret-Lutz <adl@gnu.org>
895 * lib/Automake/Variable.pm, lib/Automake/VarDef.pm: New files.
896 * lib/Automake/Makefile.am (dist_perllib_DATA): Add Variable.pm
898 * automake.in: Use Automake::Variable and Automake::VarDef.
899 (MACRO_PATTERN): Delete. Now Automake::Variable::_MACRO_PATTERN.
900 (am_macro_for_var): Delete. Now Automake::Variable::_am_macro_for_var.
901 (ac_macro_for_var): Delete. Now Automake::Variable::_ac_macro_for_var.
902 (silent_variable_override): Delete. Now
903 Automake::Variable::_silent_variable_override.
904 (var_value, var_location, var_comment, var_type, var_owner,
905 var_pretty, content_seen): Delete. This functionality is now
906 offered by Automake::Variable and Automake::VarDef.
907 (VAR_AUTOMAKE, VAR_CONFIGURE, VAR_MAKEFILE, VAR_ASIS, VAR_PRETTY):
908 Delete. Now defined in Automake::VarDef.
909 (var_order): Delete. Now Automake::Variable::_var_order.
910 (appendvar): Delete. Now Automake::Variable::_appendvar.
911 (var_SUFFIX_trigger): Register using Automake::Variable::hook.
912 (initialize_per_input): Call Automake::Variable::reset.
913 (err_var, msg_cond_var, msg_var, reject_var): Delete. Now
914 defined in Automake::Variable.
915 (generate_makefile, process_option_list, handle_languages)
916 (traverse_variable_recursively_worker)
917 (transform_variable_recursively, handle_compile)
918 (handle_libraries, handle_ltlibraries)
919 (check_typos, handle_dist, handle_subdirs, scan_autoconf_files):
920 Adjust to use Automake::Variable functions.
921 (check_ambiguous_condition): Delete. Now
922 Automake::Variable::_check_ambiguous_condition.
923 (condition_ambiguous_p): Delete. Now
924 Automake::Variable::condition_ambiguous_p.
925 (variable_not_always_defined_in_cond): Delete. Now
926 Automake::Variable::not_always_defined_in_cond.
927 (macro_define): Delete. Now Automake::Variable::define.
928 (macro_delete): Delete. Now Automake::Variable::variable_delete.
929 (macro_dump): Delete. Now Automake::Variable::variable_dump.
930 (macros_dump): Delete. Now Automake::Variable::variables_dump.
931 (variable_defined): Delete. Now
932 Automake::Variable::variable_defined, with the target check
933 temporarily disabled.
934 (variable_assert): Delete. Now Automake::Variable::variable_assert.
935 (examine_variable): Delete. Now
936 Automake::Variable::examine_variable.
937 (variable_conditions): Delete. Now Automake::Variable::conditions.
938 (scan_variable_expansions): Delete. Now
939 Automake::Variable::scan_variable_expansions.
940 (check_variable_expansions): Delete. Now
941 Automake::Variable::check_variable_expansions.
942 (check_variable_defined_unconditionally): Delete. Now
943 Automake::Variable::check_defined_unconditionally.
944 (variable_value): Delete. Now Automake::Variable::variable_value.
945 (variable_value_as_list): Delete. Now
946 Automake::Variable::variable_value_as_list.
947 (variable_value_as_list_recursive_worker): Adjust to use
948 Automake::Variable functions.
949 (variable_output): Delete. Now Automake::Variable::output.
950 (define_pretty_variable, define_configure_variable, read_am_file)
951 (define_standard_variables, read_main_am_file): Adjust to use
952 Automake::Variable functions.
953 (handle_variables): Delete. Now Automake::Variable::output_variables.
954 (file_contents_internal, am_primary_prefixes, am_install_var)
955 (require_file_with_macro, require_conf_file_with_macro)
956 (push_dist_common): : Adjust to use
957 Automake::Variable functions.
958 (require_variables): Delete. Now
959 Automake::Variable::require_variables.
960 (require_variables_for_macro): Delete. Now
961 Automake::Variable::require_variables_for_variable.
962 * tests/Makefile.am (XFAIL_TESTS): Add target.test.
964 2003-05-25 Christian Cornelssen <ccorn@cs.tu-berlin.de> (tiny change)
966 * tests/dejagnu7.test: Check if runtest supports --status.
968 2003-05-23 Alexandre Duret-Lutz <adl@gnu.org>
970 * lib/Automake/Location.pm (dump): Output 'INTERNAL' when position
973 * lib/Automake/DisjConditions.pm (human): Fix infinite loop when
974 $self contains only one Condition.
976 * automake.in: Use plain strict, including refs.
977 (macro_define, handle_single_transform_list): Use \&{'name'} to
978 build references to named subroutines.
980 2003-05-22 Karl Berry <karl@gnu.org>
982 * automake.texi: Update @dircategory to match the Free Software
983 Directory. End directory entries with dots.
985 2003-05-22 Alexandre Duret-Lutz <adl@gnu.org>
987 * automake.texi (maintainer-mode): s/François/Fran@,{c}ois/.
989 * lib/elisp-comp: s/François/Franc,ois/.
990 Suggested by Paul Eggert.
992 * automake.in: Move the "main" code at the end.
993 (parse_arguments): Move near the end.
994 ($KNOWN_EXTENSIONS_PATTERN, @known_extensions_list,
995 accept_extensions, var_SUFFIXES_trigger): Move these definitions
996 before any call to register_language.
997 (am_file): Move the definition with all other global variables,
998 do not use local to define it.
999 * Makefile.am (maintainer-check): Expect no `local' in Automake.
1001 2003-05-21 Alexandre Duret-Lutz <adl@gnu.org>
1003 * lib/Automake/Wrap.pm, lib/Automake/tests/Wrap.pl: New files.
1004 * lib/Automake/Makefile.am (dist_perllib_DATA): Add Wrap.pm.
1005 * lib/Automake/tests/Makefile.am (TESTS): Add Wrap.pl.
1006 * automake.in (handle_texinfo_helper, pretty_print_rule)
1007 (variable_output): Adjust to use makefile_wrap instead of
1008 pretty_print_internal.
1009 (pretty_print_internal): Remove. Renamed as Automake::Wrap::wrap
1010 and augmented to accept the $eol and $max_len arguments.
1012 2003-05-18 Alexandre Duret-Lutz <adl@gnu.org>
1014 * lib/Autom4te/XFile.pm, lib/config.guess, lib/config.sub,
1015 lib/texinfo.tex: New upstream versions.
1017 2003-05-17 Alexandre Duret-Lutz <adl@gnu.org>
1019 * lib/am/install.am (install, install-exec, install-data, uninstall):
1020 Declare conditionally using a if/else/endif block instead of
1021 using ?SUBDIRS?-style conditions. The latter fail when
1022 %maybe_BUILT_SOURCES% is replaced by several lines.
1023 This fixes a bug introduced on 2003-04-06.
1024 * tests/bsource.test: New file.
1025 * tests/Makefile.am (TESTS): Add bsource.test.
1026 Reported by Bruno Haible.
1028 2003-05-11 Alexandre Duret-Lutz <adl@gnu.org>
1030 * automake.texi (renamed objects): New node.
1031 (Program and Library Variables): Move maude_DEPENDENCIES closer
1032 to maude_LDADD. Define and use `per-target compilation flags' in the
1033 explanation for maude_CFLAGS et al. Link to the `renamed objects'
1034 node. Illustrate maude_SHORTNAME.
1036 2003-05-09 Alexandre Duret-Lutz <adl@gnu.org>
1038 * lib/install-sh: Update copyright notice and license to that of
1039 X11R6. This removes an advertising clause reported as Debian bug
1042 2003-05-07 Alexandre Duret-Lutz <adl@gnu.org>
1044 * configure.in (ACLOCAL): Do not use -I, --acdir is enough.
1046 * m4/make.m4: Rename the doit target as am__doit,
1048 Reported by Philip S Tellis.
1050 2003-05-07 Alexandre Duret-Lutz <adl@gnu.org>
1052 * lib/am/configure.am (%MAKEFILE-IN%): Propagate automake's exit
1054 * tests/makej.test: New file (test Autom4te's cache locking,
1055 new in CVS Autoconf).
1056 * tests/Makefile.am (TESTS): Add makej.test.
1058 2003-05-06 Alexandre Duret-Lutz <adl@gnu.org>
1060 * lib/Automake/General.pm (contents): New function.
1061 * aclocal.in (greatest_mtime, force_output): New globals.
1062 (scan_configure, add_file): Update $greatest_mtime.
1063 (parse_arguments): Parse --force.
1064 (write_aclocal): Do not overwrite $output_file unless needed.
1065 * automake.texi (aclocal options): Document --force.
1066 * tests/aclocal7.test: New file.
1067 * tests/Makefile.am (TESTS): Add aclocal7.test.
1069 2003-05-05 Alexandre Duret-Lutz <adl@gnu.org>
1071 * automake.texi (Optional): Document m4_include.
1072 (Invoking aclocal): Shake a bit to introduce the various uses
1073 of aclocal and explain that aclocal will use m4_include for
1075 (Extending aclocal): Show how to install installable macros
1076 in $(datadir)/aclocal, and make it clearer that writing installable
1077 macros is not the only way to extend aclocal.
1078 (Local Macros, Future of aclocal): New sections.
1080 2003-04-27 Alexandre Duret-Lutz <adl@gnu.org>
1082 * automake.in (@common_files): Remove acinclude.m4 since
1083 it will be m4_included by aclocal.m4 and files are always
1085 (scan_aclocal_m4): Do not bother about acinclude.m4 anymore.
1086 We will get this dependency when tracing m4_includes.
1087 * tests/aclocal6.test: Make sure acinclude.m4 is distributed
1089 * tests/acinclude.test: Delete.
1090 * tests/Makefile.am (TESTS): Remove acinclude.test.
1092 2003-04-25 Alexandre Duret-Lutz <adl@gnu.org>
1094 * automake.in (handle_configure): Don't add @configure_deps to
1095 DIST_COMMON, we do this from lib/am/configure.am now.
1096 Define the am__configure_deps variable instead of substituing
1098 * lib/am/configure.am (%MAKEFILE-IN%, $(top_srcdir)/configure,
1099 $(ACLOCAL_M4)): Use $(am__configure_deps) instead of %CONFIGURE_DEPS%.
1100 (DIST_COMMON): Add $(am__configure_deps).
1102 * tests/aclocal6.test: New file.
1103 * lib/am/configure.am (am--refresh): New rule.
1104 (%MAKEFILE-IN%, %MAKEFILE%, $(top_builddir)/config.status,
1105 $(top_srcdir)/configure): Call the top-level am--refresh from
1107 ($(ACLOCAL_M4)): Depend upon %CONFIGURE_DEPS%. Call the
1108 top-level am--refresh when not in the top-level directory.
1109 Fix jump directories for VPATH builds.
1110 Suggested by Raja R. Harinath.
1112 2003-04-24 Alexandre Duret-Lutz <adl@gnu.org>
1114 * automake.in (scan_aclocal_m4): Do not parse ACLOCAL_AMFLAGS
1115 and glob for m4_files (We've got all local m4 files while
1116 tracing m4_include's). Diagnose ACLOCAL_M4_SOURCES as obsolete.
1117 Distribute aclocal.m4 only at the top-level.
1118 (my_glob): Remove. This fixes PR automake/11.
1119 (handle_dist): Strip leading `./' from directories.
1120 * aclocal.in (add_file): Output 'm4_include([file.m4])' instead
1121 of copying local files.
1122 (write_aclocal, parse_arguments): Bump copyright date.
1123 * configure.in: De not build m4/amversion.m4 from here ...
1124 * m4/Makefile.am ($(srcdir)/amversion.m4): ... do this here.
1125 (nodist_m4data_DATA): Use $(srcdir)/amversion.m4 instead
1127 * tests/Makefile.am (XFAIL_TESTS): Remove aclocal5.test.
1128 (TESTS): Remove aclocal2.test. Do not test aclocal.test twice.
1129 * tests/aclocal2.test: Delete (pointless).
1130 * tests/aclocal5.test: Make sure configure's dependencies are
1132 * tests/acinclude.test: Adjust to search for m4_include.
1133 * tests/dirlist.test, tests/dup3.test: Run $AUTOCONF and grep
1134 configure instead of aclocal.m4.
1137 * automake.in (scan_aclocal_m4): Work in all directories, not only
1138 the top-level. Prepend $(top_srcdir) in front of each aclocal.m4
1140 * lib/am/configure.am (config.status, configure, $(ACLOCAL_M4)):
1141 Define rebuild rules in each directory.
1142 * tests/subdir8.test: Augment to exercise aclocal.m4's dependencies
1143 from the top-level directory.
1144 * tests/aclocal5.test: New file. Exercise aclocal.m4's dependencies
1145 from a subdirectory.
1146 * tests/Makefile.am (TESTS): Add aclocal5.test.
1147 (XFAIL_TESTS): Replace subdir8.test by aclocal5.test.
1149 2003-04-24 Akim Demaille <akim@epita.fr>
1150 Alexandre Duret-Lutz <adl@gnu.org>
1153 * lib/am/configure.am (%MAKEFILE-IN%): If Makefile.in is rebuilt
1154 because of one of configure's dependencies, run automake without
1155 argument to update the whole tree at once. Depend upon
1157 (%MAKEFILE%): If Makefile is rebuilt because config.status has
1158 been updated, run config.status without arguments.
1159 * automake.in (scan_autoconf_traces): Prepend $(top_srcdir)
1160 before all files in @configure_deps.
1161 * tests/subdir5.test: Modernize configure.in, make sure
1162 maude/Makefile was actually created, and exercise %CONFIGURE_DEPS%.
1163 * tests/subdir8.test: New file.
1164 * tests/Makefile.am (TESTS): Add subdir8.test.
1165 (XFAIL_TESTS): Replace subdir5.test by subdir8.test.
1167 2003-04-23 Alexandre Duret-Lutz <adl@gnu.org>
1169 * automake.texi (Requirements): Typo in index
1170 s/AC_CONFIG_FILE/AC_CONFIG_FILES/.
1172 * lib/texinfo.tex: New upstream version.
1174 2003-04-21 Jim Meyering <jim@meyering.net>
1176 * lib/mkinstalldirs: Remove each sequence of spaces before a
1178 * lib/depcomp: Search for TAB-SPC, not SPC-TAB.
1180 2003-04-19 Alexandre Duret-Lutz <adl@gnu.org>
1182 Fix for PR automake/389:
1183 * automake.in (handle_configure): Don't put $colon_infile in
1185 * tests/conff.test: New file.
1186 * tests/Makefile.am (TESTS): Add conff.test.
1187 Reported by Alexander Turbov.
1189 2003-04-18 Alexandre Duret-Lutz <adl@gnu.org>
1191 * tests/defs.in: Handle required=etags to work around
1194 * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
1197 * tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test:
1198 Distribute dejagnu test cases, so that distcheck actually runs them.
1200 2003-04-18 Richard Dawe <rich@phekda.freeserve.co.uk>
1202 * lib/am/dejagnu.am (site.exp): Don't define tool in site.exp,
1203 because we set that by invoking runtest with --tool.
1204 * tests/Makefile.am (TESTS): Add dejagnu4.test, dejagnu5.test,
1205 dejagnu6.test, dejagnu7.test.
1206 * tests/dejagnu4.test: New test.
1207 * tests/dejagnu5.test: New test.
1208 * tests/dejagnu6.test: New test.
1209 * tests/dejagnu7.test: New test.
1211 * tests/dejagnu3.test: Make sure the DejaGnu test is actually run.
1213 2003-04-18 Jim Meyering <jim@meyering.net>
1215 * automake.in (variable_output): Fix typo in comment s/is/if/.
1217 * lib/am/yacc.am (?!GENERIC?%OBJ% aka .y.c): Don't redirect
1218 directly to $@. Instead, redirect to $@t and rename upon success.
1219 Also, move the commands that update $@ so they are last. Otherwise,
1220 this rule could leave the user with an up to date target (.c file)
1221 but with a missing or corrupted corresponding .h file.
1223 2003-04-17 Richard Dawe <rich@phekda.freeserve.co.uk>
1225 * tests/defs.in: Handle required=runtest, to detect runtest
1227 * tests/Makefile.am (TESTS): Add dejagnu3.test.
1228 * tests/dejagnu3.test: New test.
1230 2003-04-16 Alexandre Duret-Lutz <adl@gnu.org>
1232 * automake.in (rule_define): If the user tries to override
1233 an Automake which has a -local variant, suggest using the
1234 -local variant in the -Woverride diagnostic.
1235 (handle_factored_dependencies): Register factored
1236 rules with rule_define, and define them only in undefined
1238 * tests/Makefile.am (TESTS): Add override.test.
1239 * tests/overrid.test: New file.
1240 * tests/phony.test: Count the number of .PHONY targets.
1242 2003-04-15 Alexandre Duret-Lutz <adl@gnu.org>
1244 * lib/am/distdir.am (distuninstallcheck, distcleancheck): Silence
1245 these rules, so that we don't confuse users by echoing
1246 "echo ERROR:" commands which are not run.
1248 2003-03-14 Richard Dawe <rich@phekda.freeserve.co.uk>
1249 Alexandre Duret-Lutz <adl@gnu.org>
1251 * automake.in (output_texinfo_build_rules, handle_texinfo_helper,
1252 initialize_per_input): Add infrastructure for generating HTML
1253 documentation from texinfo source.
1254 * lib/am/texinfos.am: Add rules for building HTML documentation
1255 from texinfo source.
1256 * lib/am/texibuild.am: Likewise.
1257 * automake.texi (Texinfo): Document rules for building
1258 HTML documentation from texinfo source.
1259 * tests/txinfo21.test: New file.
1260 * tests/Makefile.am (TESTS): Add txinfo21.test.
1261 * tests/defs.in: Handle required=makeinfo-html.
1263 2003-04-14 Alexandre Duret-Lutz <adl@gnu.org>
1265 * automake.in (%silent_variable_override): New variable.
1266 (macro_define): Warn about variable definitions overriding
1268 (rule_define): Warn about target definitions overriding
1269 Automake variables. Fix $condmsg definition.
1270 * automake.texi (Invoking Automake): Document the `override'
1272 * lib/Automake/ChannelDefs.pm (usage): Likewise.
1273 * lib/am/texinfos.am [!%?CYGNUS] (MAKEINFO): Do not define,
1274 this is already done in m4/init.m4.
1275 * tests/dejagnu2.test: Run $MAKE, don't only grep. Use
1276 -Wno-override, and make sure we get a warning without.
1277 * tests/exeext2.test, tests/substtarg.test: Use -Wno-override,
1278 and make sure we get a warning without.
1279 * tests/exeext3.test, tests/java2.test, tests/nolink.test,
1280 tests/subpkg.test, tests/vartest.test: Use -Wno-override.
1281 * tests/txinfo13.test: Use installcheck-local instead of overriding
1283 * tests/txinfo2.test: Run $MAKE on the real Makefile (this test
1284 used to succeed thanks to a failure...)
1285 * tests/location.test: Adjust expected messages.
1286 * tests/Makefile.am (XFAIL_TESTS): Add txinfo5.test.
1288 2003-04-12 Raja R Harinath <harinath@acm.org>
1290 * lib/Automake/DisjConditions.pm (true): Don't cache answer.
1291 (invert): Update comment.
1292 (_simplify): Remove.
1293 (simplify): Implement using invert().
1294 * lib/Automake/tests/DisjConditions.pl (test_simplify):
1295 Update to reflect changes.
1297 2003-04-12 Alexandre Duret-Lutz <adl@gnu.org>
1299 * automake.in (scan_autoconf_files): Augment the error message
1300 about AM_INIT_AUTOMAKE not found.
1301 Suggested by Bruno Haible.
1303 * lib/Automake/Version.pm: New file.
1304 * lib/Automake/Makefile.am (dist_perllib_DATA): Add Version.pm.
1305 * lib/Automake/tests/Version.pl: New file.
1306 * lib/Automake/tests/Makefile.am (TESTS): Add Version.pl.
1307 * tests/Makefile.am (TESTS): Remove version5.test.
1308 * tests/version5.test: Delete. Move the tests to Version.pl.
1309 * automake.in (version_split, version_compare, version_check): Move ...
1310 * lib/Automake/Version.pm (split, compare, check): ... here.
1312 2003-04-11 Alexandre Duret-Lutz <adl@gnu.org>
1314 * lib/Automake/tests/Condition.pl (test_reduce_and)
1315 (test_reduce_or): Cosmetics.
1316 * lib/Automake/tests/DisjConditions.pl (test_sub_conditions):
1318 * lib/Automake/DisjConditions.pm (sub_conditions): Add missing C<...>
1320 * tests/yacc8.test, configure.in: Update copyright year.
1322 2003-04-10 Richard Dawe <rich@phekda.freeserve.co.uk>
1324 * configure.in: Get the build platform name. Define
1325 MODIFICATION_DELAY as the time to wait after modifying a file,
1326 to cope with timestamp granularity issues, depending
1328 * tests/defs.in: Define `sleep' using MODIFICATION_DELAY.
1330 2003-04-10 Eric Siegerman <eric_97@pobox.com> (tiny change)
1332 * automake.texi (Public macros): Clarify that the new
1333 AM_INIT_AUTOMAKE variant is preferred, and the old one
1334 deprecated. Copy-edit the rest of the AM_INIT_AUTOMAKE item.
1335 (Hello): Caution that the example uses the deprecated
1336 AC_INIT/AM_INIT_AUTOMAKE syntax, and xref to the discussion.
1338 2003-04-10 Alexandre Duret-Lutz <adl@gnu.org>
1340 Retain all variable definitions until the whole Makefile.am has
1341 been processed, then output all variables in one step, at the top
1342 of Makefile.in. (Older revisions used to output user variables
1343 before generating Automake targets, and to mix Automake variables
1344 with Automake targets, preventing redefinitions of previously
1347 * automake.in (%var_pretty): New variable.
1348 (VAR_ASIS, VAR_PRETTY): New constants.
1349 (@var_list): Rename as ...
1350 (@var_order): ... this.
1351 (initialize_per_input): Clear %var_pretty.
1352 (handle_variables): New function, extracted from ...
1353 (read_main_am_file): ... here.
1354 (generate_makefile): Call handle_variable after everything else.
1355 (handle_dist): Use define_pretty_variable, not pretty_print.
1356 (pretty_print): Delete.
1357 (macro_define): Augment with $COMMENT and $PRETTY parameters.
1358 Update %var_comment, %var_pretty, and @var_order. Adjust callers.
1359 (variable_pretty_output): Merge with ...
1360 (variable_output): ... this, and choose the prettiness on a
1361 per-condition basis.
1362 (append_comments): Delete. This work is now done by macro_define.
1363 (read_am_file, file_contents_internal): Don't call append_comments
1364 nor update @var_list, adjust calls to macro_define.
1365 (handle_subdirs): Don't explicitly output RECURSIVE_TARGETS,
1366 just mark it as VAR_PRETTY.
1367 * tests/exeext.test: Make sure bin_PROGRAMS is output only once.
1368 Report from Jim Meyering.
1370 2003-04-06 Alexandre Duret-Lutz <adl@gnu.org>
1372 * automake.in (handle_installdirs): Rename as ...
1373 (handle_install): ... this. Define maybe_BUILT_SOURCES.
1374 (generate_makefile): Adjust call to handle_install.
1375 * lib/am/install.am (install): Use %maybe_BUILT_SOURCES%.
1376 * automake.texi (Sources, Built sources example): BUILT_SOURCES
1377 is honored by `make install' too.
1378 * tests/check3.test: Make sure that `make install' also depends
1380 Report from Alexander Turbov.
1382 * lib/am/libs.am (ARFLAGS): Define.
1383 * automake.in (handle_libraries): Use `$(ARFLAGS)' instead of
1385 * automake.texi (A Library): Explain how AR, ARFLAGS and RANLIB
1386 are used, and how they can be overridden.
1387 (Program and Library Variables): Adjust to show `$(ARFLAGS)'
1389 * tests/ar.test: Rewrite to test for AR, ARFLAGS, and RANLIB.
1390 * tests/ranlib.test: Delete, obsoleted by ar.test.
1391 * tests/Makefile.am (TESTS): Remove ranlib.test.
1392 Report from Paul Thomas.
1394 2003-04-03 Alexandre Duret-Lutz <adl@gnu.org>
1396 * automake.in (check_trailing_slash): New function (variation on
1397 a patch by Peter Muir). Diagnose whitespaces following trailing
1399 (read_am_file): Use it.
1400 * tests/backsl4.test: New file.
1401 * tests/Makefile.am (TESTS): Add backsl4.test.
1402 Reported by Peter Muir.
1404 2003-03-29 Raja R Harinath <harinath@acm.org>
1406 Speedup Automake::DisjConditions::invert().
1407 * lib/Automake/Condition.pm (multiply): New.
1408 * lib/Automake/DisjConditions.pm (_multiply): Use it.
1409 (sub_conditions): Likewise.
1411 * lib/Automake/Condition.pm (reduce): Rename to ...
1412 (reduce_and): ... this.
1414 * lib/Automake/DisjConditions.pm (_multiply): Use reduce_or().
1415 * lib/Automake/tests/Condition.pl (test_reduce): Rename to ...
1416 (test_reduce_and): ... this.
1417 (test_reduce_or): New.
1418 * lib/Automake/tests/DisjConditions.pl
1419 (test_invert): Update to reflect effect of reduce_or().
1420 (test_simplify): Don't skip invert() on larger inputs.
1422 2003-03-29 Raja R Harinath <harinath@cs.umn.edu>
1424 * tests/yacc8.test: Add a $sleep before modifying Makefile.am so
1425 that timestamp will change.
1427 2003-03-23 Akim Demaille <akim@epita.fr>
1428 Alexandre Duret-Lutz <adl@gnu.org>
1430 * lib/am/tags.am (TAGS): Use --etags-include instead of --include,
1431 when supported by etags (Exuberant Ctags).
1432 * tests/tagsub.test: Rewrite to _run_ the `tags' rule.
1434 2003-03-20 Alexandre Duret-Lutz <adl@gnu.org>
1436 For Debian Bug #185388:
1437 * automake.texi (Extending): Augment the install-exec-hook
1438 discussion with an example how to symlink a versioned binary.
1439 * tests/insthook.test: Rewrite to test the above example.
1440 Report from James R. Van Zandt.
1442 2003-03-19 Alexandre Duret-Lutz <adl@gnu.org>
1444 * Makefile.am (maintainer-check): Allow `automake:' tokens,
1445 occuring in location.test. Automake now has 5 legitimate
1446 unsubstituted @strings@.
1448 * tests/aclocal4.test: Require GNU make.
1450 2003-03-14 Alexandre Duret-Lutz <adl@gnu.org>
1452 * tests/aclocal4.test: New file. Test for the ACLOCAL_M4 bug below.
1453 * tests/Makefile.am (TESTS): Add aclocal4.test.
1455 2003-03-14 Jim Meyering <jim@meyering.net>
1457 * automake.in (scan_aclocal_m4): Define ACLOCAL_M4 even in
1458 subdirectories. Makefile.in depends on that variable.
1460 2003-03-13 Alexandre Duret-Lutz <adl@gnu.org>
1462 * m4/init.m4: Remove a leftover comment from the pre-1.7 era.
1464 Fix for PR automake/386:
1465 * m4/init.m4: Require Autoconf 2.55.
1466 Reported by Owen Taylor.
1468 * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
1469 (?GENERIC?%EXT%.lo): Use `mv -f' instead of `mv' in FASTDEP mode.
1470 Suggested by Matthias Andree.
1472 * tests/README: Typo.
1474 2003-03-08 Alexandre Duret-Lutz <adl@gnu.org>
1476 * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj)
1477 (?GENERIC?%EXT%.lo): Hide the if/then/else machinery for FASTDEP.
1478 Just echo the gcc command.
1479 Suggested by Karl Berry.
1481 2003-03-06 Alexandre Duret-Lutz <adl@gnu.org>
1483 * lib/am/depend2.am (?GENERIC?%EXT%.lo): Do not use
1484 `test -f foo || echo $(srcdir)/` to emulate a VPATH search when
1485 outputing suffix rules. This follows 2003-02-25's change.
1486 * lib/am/lex.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.
1487 * lib/am/yacc.am (?GENERIC?%EXT%%DERIVED-EXT%): Likewise.
1489 2003-03-05 Alexandre Duret-Lutz <adl@gnu.org>
1491 * automake.texi (Requirements) <AC_CONFIG_FILES>: Files listed
1492 with AC_CONFIG_FILES are cleaned by `make distclean'. Don't
1494 Reported by Rafael Laboissiere.
1496 2003-03-04 Andreas Buening <andreas.buening@nexgo.de>
1498 * lib/mdate-sh: Find out which column of the ls -l output contains
1499 the month. Do not assume it is at least the fifth column.
1501 2003-02-26 Alexandre Duret-Lutz <adl@gnu.org>
1503 * automake.texi (Emacs Lisp): Mention that `dist_' can be used.
1505 * automake.texi (Emacs Lisp): Instruct people to use lisp_DATA
1506 instead of lisp_LISP when they don't want byte-compilation.
1507 Don't mention ELCFILES anymore.
1508 * automake.in (handle_data): Allow lisp_DATA.
1509 * tests/lisp5.test: New file.
1510 * tests/Makefile.am (TESTS): Add lisp5.test.
1512 * automake.in (handle_emacs_lisp): Don't build *.elc files
1513 if ELCFILES was set empty.
1514 * tests/lisp4.test: New file.
1515 * tests/Makefile.am (TESTS): Add lisp4.test.
1516 Reported by Simon Josefsson.
1518 * tests/lex3.test, tests/lex5.test: Require flex.
1519 Reported by Leo Davis.
1521 2003-02-25 Alexandre Duret-Lutz <adl@gnu.org>
1523 * lib/am/depend2.am (?GENERIC?%EXT%.o, ?GENERIC?%EXT%.obj): Do not
1524 use the `test -f foo || echo $(srcdir)/` to emulate a VPATH search
1525 when outputing suffix rules.
1526 * lib/am/texibuild.am (?GENERIC?%SOURCE_SUFFIX%.dvi)
1527 (?GENERIC?%SOURCE_SUFFIX%.pdf): Likewise.
1528 Suggested by Bruno Haible.
1530 * automake.in (read_am_file): Catch trailing backslashes on last line.
1531 * tests/backsl3.test: New file.
1532 * tests/Makefile.am (TESTS): Add backsl3.test.
1533 Reported by Akim Demaille.
1535 2003-02-24 Alexandre Duret-Lutz <adl@gnu.org>
1537 * ChangeLog: Move 2002's entries to ...
1538 * ChangeLog.02: ... this new file.
1539 * Makefile.am (EXTRA_DIST): Add ChangeLog.02.
1541 2003-02-24 Richard Dawe <rich@phekda.freeserve.co.uk>
1543 * tests/version7.test: Use $sleep to sleep before updating
1544 the version, to work around timestamp inconsistencies in Windows.
1546 2003-02-24 Bruno Haible <bruno@clisp.org>
1547 Alexandre Duret-Lutz <adl@gnu.org>
1549 * lib/am/texibuild.am: Don't remove the target info files. Instead,
1550 back up and restore them if makeinfo fails.
1551 * tests/txinfo20.test: New file.
1552 * tests/Makefile.am (TESTS): Add txinfo20.test.
1554 2003-02-23 Alexandre Duret-Lutz <adl@gnu.org>
1556 * automake.texi (FAQ, CVS, maintainer-mode, wildcards)
1557 (distcleancheck): Fix typos and other errors reported by Karl
1560 2003-02-20 Alexandre Duret-Lutz <adl@gnu.org>
1562 * lib/am/texibuild.am (%SOURCE_SUFFIX%%DEST_SUFFIX%): Use $(...)
1565 * tests/defs.in: Handle required=ro-dir.
1566 * tests/destdir.test: Use this.
1568 2003-02-19 Richard Dawe <rich@phekda.freeserve.co.uk>
1570 * lib/am/distdir.am (distcheck): Strip any leading DOS drive
1571 from dc_install_base.
1573 2003-02-19 Alexandre Duret-Lutz <adl@gnu.org>
1575 * lib/am/texinfos.am (install-info-am, uninstall-info-am): Install
1576 DJGPP-style *.iNN info files.
1577 (maintainer-clean-aminfo): Rewrite using the same pattern
1578 as in uninstall-info-am.
1579 * lib/am/texibuild.am (%SOURCE_SUFFIX%%DEST_SUFFIX%): Erase
1580 DJGPP-style *.iNN info files before running $(MAKEINFO).
1581 * tests/txinfo19.test: New file.
1582 * tests/Makefile.am (TESTS): Add txinfo19.test.
1584 2003-02-18 Richard Dawe <rich@phekda.freeserve.co.uk>
1586 * lib/depcomp (dashmstdout): Cope with DOS filenames in
1589 2003-02-17 Alexandre Duret-Lutz <adl@gnu.org>
1591 * lib/depcomp (makedepend): Don't pass $object to makedepend.
1592 Reported by Stepan Kasal.
1594 2003-02-12 Alexandre Duret-Lutz <adl@gnu.org>
1596 * tests/defs.in: Handle required=makedepend.
1598 * Makefile.am (maintainer-check): Update the diff check
1599 to account for the recent @SHELL@ substitution.
1601 2003-02-11 Alexandre Duret-Lutz <adl@gnu.org>
1603 * lib/depcomp: Do not put comments on the `icc)' line.
1605 * lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
1608 Fix for PR automake/381:
1609 * automake.in (handle_gettext): Do not print diagnostics
1610 about po/ and intl/ missing from SUBDIRS if po/ does not
1611 exist. Warn if `SUBDIRS = intl' is used although libintl
1613 * tests/gettext.test: Make sure diagnostics are not output
1614 when po/ does not exist.
1615 * tests/gettext2.test: Test for unwanted intl/.
1616 PR from Alexander Turbov, fix suggested by Bruno Haible.
1618 * m4/depend.m4: Grep depcomp's stderr for icc warnings about
1620 * lib/depcomp (icc): New mode.
1621 * tests/depcomp5.test: New file.
1622 * tests/defs.in: Handle required=icc.
1623 * tests/Makefile.am (TESTS): Add it.
1625 Temporary hack for PR automake/381:
1626 * automake.in (handle_gettext): Turn missing po/ and intl/ errors
1627 into -Wsyntax warnings.
1629 2003-02-10 Richard Dawe <rich@phekda.freeserve.co.uk>
1631 * Makefile.am: Substitute @SHELL@ in automake.in and aclocal.in.
1632 This makes the setting of SHELL work for DJGPP.
1634 2003-02-10 Alexandre Duret-Lutz <adl@gnu.org>
1636 For PR automake/385:
1637 * lib/depcomp (makedepend): Strip any libtool call, before
1638 running makedepends.
1639 * tests/depcomp4.test: New file.
1640 * tests/Makefile.am (TESTS): Add it.
1641 Reported by Jeff Squyres.
1643 Related to PR automake/385:
1644 * lib/depcomp (dashmstdout): Do not use `-o /dev/null', or gcc will
1645 write dependencies to /dev/null. `-o /dev/null' was added
1646 on 2002-06-13 just because I tried to replace `-o foo.o' by something
1647 else and didn't thought about removing it entirely.
1648 * tests/depcomp3.test: New file.
1649 * tests/Makefile.am (TESTS): Add it.
1651 * automake.in (BEGIN): Override $ENV{'SHELL'} with ./configure's
1653 Suggested by Richard Dawe.
1655 2003-02-09 Alexandre Duret-Lutz <adl@gnu.org>
1657 * automake.texi (FAQ, CVS, maintainer-mode, wildcards)
1658 (distcleancheck): New nodes.
1660 2003-02-06 Alexandre Duret-Lutz <adl@gnu.org>
1662 * automake.in (scan_autoconf_files): Don't complain that
1663 AM_INIT_AUTOMAKE comes from an old version if it was not found.
1665 2003-02-05 Alexandre Duret-Lutz <adl@gnu.org>
1667 * automake.in (am_install_var): Simplify filtering of
1668 variable_loc_and_value_as_list_recursive's output.
1670 2003-02-04 Alexandre Duret-Lutz <adl@gnu.org>
1672 * m4/init.m4 (_AC_AM_CONFIG_HEADER_HOOK): Recompute
1673 indexes of header files so we create stamp files with
1674 the right numbers when config.status is run on some headers.
1675 * tests/stamph2.test: Check for this.
1676 Reported by Sander Niemeijer.
1678 2003-02-02 Alexandre Duret-Lutz <adl@gnu.org>
1680 * automake.in (vars_scanned): Move near traverse_variable_recursively.
1681 (traverse_variable_recursively,
1682 traverse_variable_recursively_worker): Accept a $COND_FILTER argument
1683 to filter out conditions during recursion. Don't recurse into
1684 undefined variables. Don't pass empty results to &FUN_COLLECT.
1685 (value_to_list): Remove, was used by
1686 variable_value_as_list_recursive_worker only.
1687 (variable_value_as_list_recursive_worker): Rewrite using
1688 traverse_variable_recursively. Remove the $parent argument.
1689 (variable_value_as_list_recursive,
1690 variable_loc_and_value_as_list_recursive): Adjust calls
1691 to variable_value_as_list_recursive_worker. Don't reset
1693 * tests/cond3.test: Don't expect empty helper variables,
1694 we don't output them anymore.
1695 * tests/cond30.test: Use an undefined variable.
1697 * automake.in (handle_programs): Strip $(EXEEXT) before
1698 calling &check_canonical_spelling.
1699 * tests/exeext.test: Make sure we don't use a
1700 maude3__EXEEXT__OBJECTS variable.
1702 2003-02-02 Jeremy Nimmer <jwnimmer@alum.mit.edu> (tiny change)
1704 For Debian Bug #39542:
1705 * automake.texi (Invoking Automake, Optional): Document how
1706 AC_CONFIG_AUX_DIR interacts with missing files.
1708 2003-02-02 Alexandre Duret-Lutz <adl@gnu.org>
1710 * lib/Automake/DisjConditions.pm (_permutations_worker)
1711 (permutations): Remove, so that people aren't tempted to use it.
1712 * lib/Automake/tests/DisjConditions.pl (tests_permutations): Remove.
1714 * automake.in (variable_conditions_recursive): Remove.
1715 (variable_conditionally_defined): Rewrite using
1716 traverse_variable_recursively.
1718 * automake.in (traverse_variable_recursively,
1719 traverse_variable_recursively_worker): Pass one merged Condition
1720 instead of a stack of conditions to &FUN_STORE and &FUN_COLLECT.
1721 (transform_variable_recursively, define_objects_from_sources)
1722 (handle_lib_objects, variable_conditions_recursive): Adjust usage.
1724 2003-02-01 Alexandre Duret-Lutz <adl@gnu.org>
1726 * automake.in (handle_lib_objects): Compute _DEPENDENCIES variables
1727 using transform_variable_recursively instead of
1728 variable_conditions_recursive and variable_value_as_list_recursive
1729 to avoid combinatorial explosion.
1730 (handle_lib_objects_cond): Merge into handle_lib_objects.
1731 * tests/cond11.test: Don't grep internal details in Makefile.in,
1732 run $MAKE to make sure the resulting Makefile runs as expected.
1733 * tests/cond29.test: Also exercise conditional _LDADD.
1734 * tests/cond31.test, tests/cond32.test: New files.
1735 * tests/Makefile.am (TESTS): Add tests/cond31.test and
1738 2003-01-31 Alexandre Duret-Lutz <adl@gnu.org>
1740 * automake.in (handle_lib_objects_cond): Ignore -dlopen and
1741 -dlpreopen in _LIBADD variables too.
1742 (handle_LIBOBJS, handle_ALLOCA): New functions, extracted from
1743 handle_lib_objects_cond.
1744 * tests/libtool7.test: New file.
1745 * tests/Makefile.am (TESTS): Add libtool7.test.
1747 * automake.texi (Program and Library Variables): Clarify that
1748 _LIBADD is for libraries and _LDADD for programs.
1750 * automake.in (handle_source_transform): Correct typo from 2003-01-23.
1752 2003-01-28 Alexandre Duret-Lutz <adl@gnu.org>
1754 Fix for PR automake/352:
1755 * automake.in (transform_variable_recursively): If the destination
1756 and the source variables are the same, delete the source variable
1757 before defining the destination variable.
1758 (handle_programs): Strip any $(EXEEXT) suffix from $one_file,
1759 or this will confuse handle_source_transform.
1760 (append_exeext): Rewrite using transform_variable_recursively.
1761 * tests/cond29.test, tests/cond30.test: New files.
1762 * tests/exeext.test: Run ./configure and make, this uncovered
1763 the above handle_programs issue.
1764 * tests/Makefile.am (TESTS): Add cond29.test and cond20.test.
1766 * automake.in (%subobjvar): Replace by ...
1767 (%gen_varname): ... this.
1768 (subobjname): Replace by ...
1769 (gen_varname): ... this.
1770 (initialize_per_input): Clean gen_varname instead of subobjname.
1771 (transform_variable_recursively): New function, extracted
1772 from define_objects_from_sources.
1773 (define_objects_from_sources): Use transform_variable_recursively.
1774 Remove the unused $parent argument.
1775 (handle_source_transform): Adjust call to define_objects_from_sources.
1777 2003-01-23 Alexandre Duret-Lutz <adl@gnu.org>
1779 * automake.in (@substfroms, @substtos): Move near
1780 traverse_variable_recursively.
1781 (traverse_variable_recursively, traverse_variable_recursively_worker):
1782 New functions, extracted from define_objects_from_sources.
1783 (define_objects_from_sources): Rewrite using
1784 traverse_variable_recursively.
1785 (handle_source_transform): Use variables_conditionally_defined
1786 instead of calling variable_conditions_recursive directly.
1787 Adjust the call to define_objects_from_sources; there is no need
1788 to reset @substtos, @substfroms, and %vars_scanned now.
1789 (variable_conditions_recursive): Rewrite using
1790 traverse_variable_recursively.
1791 (variable_conditions_recursive_sub): Remove.
1792 (variable_conditionally_defined): Fix condition comparison (the
1793 consequence was that DIST_SUBDIRS was always output).
1794 * lib/Automake/Condition.pm (merge): Allow merging several
1797 2003-01-22 Alexandre Duret-Lutz <adl@gnu.org>
1799 * automake.texi (Python): Explain that directory variables start
1800 with either ${prefix} or ${exec_prefix}, and point to the
1801 `Installation Directory Variables' section of the Autoconf manual.
1803 2003-01-21 Alexandre Duret-Lutz <adl@gnu.org>
1805 * lib/am/distdir.am (top_distdir, distdir): Define these
1806 variables only in top level Makefile. Redefine $(top_distdir)
1808 (distdir): Fix passing of $(top_distdir) to sub-makes.
1809 * automake.in (handle_dist): Do not define the DISTDIR and
1810 TOP_DISTDIR transformations. We don't need them anymore.
1811 * automake.texi (Dist): Reorder the dist-hook section, and move
1812 the DIST_SUBDIRS paragraph earlier. Document distdir and
1814 * tests/subpkg.test: Update to check for $(distdir) and
1817 2003-01-19 Alexandre Duret-Lutz <adl@gnu.org>
1819 Rename more files to accomodate 8+3 file systems, and adjust the
1820 vocabulary at the same time: AM_CONDITIONAL defines "conditionals",
1821 and we call "condition" a conjunction of "conditionals".
1822 * lib/am/Conditional.pm: Rename to lib/am/Condition.pm.
1823 * lib/am/tests/Conditional.pl: Rename to lib/am/tests/Condition.pl.
1824 * lib/am/ConditionalSet.pm: Rename to lib/am/DisjConditions.pm.
1825 * lib/am/tests/ConditionalSet.pl: Rename to
1826 lib/am/tests/DisjConditions.pl
1827 * lib/am/Conditional.pm (condition_negate): Rename to ...
1828 * lib/am/Condition.pm (conditional_negate): ... this.
1829 * automake.in: Adjust references to Condition and DisjConditions.
1830 (check_ambiguous_conditional, conditional_ambiguous_p): Rename to ...
1831 (check_ambiguous_condition, condition_ambiguous_p): ... these.
1833 * tests/README: New file.
1835 * automake.texi (Conditional Programs): Show a sample Makefile.am.
1836 Remind $(EXEEXT) must be appended to configure substitutions.
1837 Show how Automake conditionals can be used instead.
1838 * tests/exeext.test (check_PROGRAMS): Make sure EXEEXT is also
1839 appended to conditionally defined programs.
1841 2003-01-16 Jim Meyering <jim@meyering.net>
1843 Accept --help and --version, and lots of syntactic clean-up.
1844 * lib/install-sh: Use consistent indentation, two spaces per level.
1845 (scriptversion): New variable.
1846 Change initializations like `variable=""' to `variable='.
1847 (usage): New variable.
1848 Use `test', not `['.
1849 Use `test -z "$var"', not `[ x"$var" = x ]'.
1850 Use `test -n "$var"', not `[ x"$var" != x ]'.
1851 Alphabetize case entries.
1852 Accept --help and --version options.
1853 Remove unnecessary `else :' clauses.
1854 Add a `Local variables' eval block to help emacs users update
1855 the time-stamp variable added above.
1856 Mostly from Karl Berry.
1858 2003-01-16 Alexandre Duret-Lutz <adl@gnu.org>
1860 * m4/python.m4 (AM_PATH_PYTHON) <_AM_PYTHON_INTERPRETER_LIST>: Add
1863 * m4/python.m4 (AM_PATH_PYTHON): Query distutils for `pythondir'
1864 or `pyexecdir', for the sake of 64-bit distributions that usually
1865 use lib64/ instead of lib/. Fall back to the default directory
1867 Suggested by Gwenole Beauchesne.
1869 2003-01-14 Alexandre Duret-Lutz <adl@gnu.org>
1871 For PR automake/382:
1872 * automake.texi (Yacc and Lex): Document `AM_YFLAGS = -d'.
1873 Explain BUILT_SOURCES is usually needed in this case.
1874 Reported by William S Fulton.
1876 2003-01-13 Alexandre Duret-Lutz <adl@gnu.org>
1878 Rename some files for the sake of 8+3 file systems.
1879 * tests/aclocali.test: Rename to tests/aclocal.test.
1880 * tests/aclocali1.test: Rename to tests/aclocal2.test.
1881 * tests/aclocalii.test: Rename to tests/aclocal3.test.
1882 * tests/acoutput.test: Rename to tests/acoutpt.test.
1883 * tests/acoutput2.test: Rename to tests/acoutpt2.test.
1884 * tests/acouttbs.test: Rename to tests/acoutbs.test.
1885 * tests/acouttbs2.test: Rename to tests/acoutbs2.test.
1886 * tests/autoheader.test: Rename to tests/autohdr.test.
1887 * tests/autoheader2.test: Rename to tests/autohdr2.test.
1888 * tests/condincl.test: Rename to tests/condinc.test.
1889 * tests/condincl2.test: Rename to tests/condinc2.test.
1890 * tests/distcommon.test: Rename to tests/distcom.test.
1891 * tests/distcommon2.test: Rename to tests/distcom2.test.
1892 * tests/distcommon3.test: Rename to tests/distcom3.test.
1893 * tests/installsh.test: Rename to tests/instsh.test.
1894 * tests/installsh2.test: Rename to tests/instsh2.test.
1895 * tests/instdata.test: Rename to tests/instdat.test.
1896 * tests/instdata2.test: Rename to tests/instdat2.test.
1897 * tests/libobj12b.test: Rename to tests/libobj13.test.
1898 * tests/link_f_c.test: Rename to tests/link_fc.test.
1899 * tests/link_f_c_cxx.test: Rename to tests/link_fccxx.test.
1900 * tests/link_f_cxx.test: Rename to tests/link_fcxx.test.
1901 * tests/nodefine.test: Rename to tests/nodef.test.
1902 * tests/nodefine2.test: Rename to tests/nodef2.test.
1903 * tests/required.test: Rename to tests/reqd.test.
1904 * tests/required2.test: Rename to tests/reqd2.test.
1905 * tests/sourcesub.test: Rename to tests/srcsub.test.
1906 * tests/sourcesub2.test: Rename to tests/srcsub2.test.
1907 * tests/specflags.test: Rename to tests/specflg.test.
1908 * tests/specflags2.test: Rename to tests/specflg2.test.
1909 * tests/specflags3.test: Rename to tests/specflg3.test.
1910 * tests/specflags6.test: Rename to tests/specflg6.test.
1911 * tests/specflags7.test: Rename to tests/specflg7.test.
1912 * tests/specflags8.test: Rename to tests/specflg8.test.
1913 * tests/specflags9.test: Rename to tests/specflg9.test.
1914 * tests/subdircond.test: Rename to tests/subcond.test.
1915 * tests/subdircond2.test: Rename to tests/subcond2.test.
1916 * tests/subdircond3.test: Rename to tests/subcond3.test.
1917 * tests/texinfo.test: Rename to tests/txinfo.test.
1918 * tests/texinfo2.test: Rename to tests/txinfo2.test.
1919 * tests/texinfo3.test: Rename to tests/txinfo3.test.
1920 * tests/texinfo4.test: Rename to tests/txinfo4.test.
1921 * tests/texinfo5.test: Rename to tests/txinfo5.test.
1922 * tests/texinfo6.test: Rename to tests/txinfo6.test.
1923 * tests/texinfo7.test: Rename to tests/txinfo7.test.
1924 * tests/texinfo8.test: Rename to tests/txinfo8.test.
1925 * tests/texinfo9.test: Rename to tests/txinfo9.test.
1926 * tests/texinfo10.test: Rename to tests/txinfo10.test.
1927 * tests/texinfo13.test: Rename to tests/txinfo13.test.
1928 * tests/texinfo16.test: Rename to tests/txinfo16.test.
1929 * tests/texinfo17.test: Rename to tests/txinfo17.test.
1930 * tests/texinfo18.test: Rename to tests/txinfo18.test.
1931 * tests/Makefile.am (TESTS): Adjust.
1932 * ChangeLog.1996: Rename to ChangeLog.96.
1933 * ChangeLog.1998: Rename to ChangeLog.98.
1934 * ChangeLog.2000: Rename to ChangeLog.00.
1935 * ChangeLog.2001: Rename to ChangeLog.01.
1936 * Makefile.am (EXTRA_DIST): Adjust.
1937 Reported by Richard Dawe.
1939 2003-01-13 Richard Dawe <rich@phekda.freeserve.co.uk> (tiny change)
1941 * lib/am/distdir.am (distcheck): '=' is not valid in DOS filenames.
1942 Use '_build' and '_inst' instead of '=build' and '=inst'.
1943 * tests/man2.test: Reflect change automake: check for files in
1944 '_build' and '_inst' directories instead of '=build' and '=inst'.
1946 2003-01-13 Alexandre Duret-Lutz <adl@gnu.org>
1948 Use `_dirstamp' when the file-system doesn't support `.dirstamp'.
1949 * m4/lead-dot.m4: New file.
1950 * m4/Makefile.am (dist_m4data_DATA): Add lead-dot.m4
1951 * m4/init.m4 (AM_INIT_AUTOMAKE): Require AM_SET_LEADING_DOT.:
1952 * m4/depend.m4 (AM_SET_DEPDIR): Require AM_SET_LEADING_DOT. Define
1953 DEPDIR using am__leading_dot.
1954 * automake.in (require_build_directory): Define am__dirstamp, a new
1955 variable for the dirstamp basename, based on am__leading_dot.
1956 * tests/subobj6.test: Move all `test -f' into Makefiles, so we can
1957 use $(am__dirstamp).
1958 Reported by Richard Dawe.
1960 * tests/gnits2.test, tests/pr300-prog.test, tests/transform.test:
1961 Move all `test -f' into Makefiles, so we can honor $(EXEEXT) when
1962 testing for programs.
1963 Reported by Richard Dawe.
1965 2003-01-10 Alexandre Duret-Lutz <adl@gnu.org>
1967 * Makefile.am (maintainer-check): Suggest using $sleep instead of
1969 * tests/defs.in (sleep): New variable.
1970 * tests/asm.test, tests/confsub.test, tests/lisp3.test,
1971 tests/texinfo16.test, tests/warnopts.test, tests/yaccvpath.test:
1972 Use $sleep instead of sleep 2, to work around timestamp
1973 inconsistencies in Windows.
1974 Reported by Richard Dawe.
1976 * Makefile.am (maintainer-check): Do not require SHELL=/bin/sh
1978 * tests/ansi3.test, tests/ansi5.test, tests/cond22.test,
1979 tests/man2.test, tests/subobj3.test, tests/suffix8.test,
1980 tests/suffix11.test: Do not set SHELL=/bin/sh after $MAKE -e.
1981 $SHELL is overridden by tests/defs, so it won't hurt even
1982 if $MAKE -e uses the $SHELL envvar.
1983 * tests/ansi.test, tests/insh2.test, tests/texinfo.test,
1984 tests/texinfo8.test: Use SHELL=$SHELL, not SHELL=/bin/sh.
1985 Reported by Richard Dawe.
1987 Build elisp files all at once instead of one by one.
1988 * automake.in (handle_emacs_lisp): Define am__ELFILES. Add
1989 elc-stamp to all's dependencies.
1990 * lib/am/lisp.am (elc-stamp): New rule, build all *.elc files.
1991 (.el.elc): Rewrite to call elc-stamp if $@ doesn't exist.
1992 (clean-lisp): Clean elc-stamp.
1993 * lib/elisp-comp: Reindent. Erase the temporatry directory
1994 from a trap. Propagate Emacs's exit status.
1995 * tests/lisp3.test: New file.
1996 * tests/Makefile.am (TESTS): Add lisp3.test.
1997 Reported by Ryan T. Sammartino.
1999 2003-01-09 Akim Demaille <akim@epita.fr>
2001 * automake.texi: Prefer $(FOO) to @FOO@ in the documentation.
2003 2003-01-08 Alexandre Duret-Lutz <adl@gnu.org>
2005 * m4/lispdir.m4: Register EMACS and EMACSLOADPATH as precious
2006 variables. Suggested by Ryan T. Sammartino.
2008 2003-01-05 Alexandre Duret-Lutz <adl@gnu.org>
2010 * automake.in (macro_define): Add missing `{$cond}' (typo from
2012 ($gen_copyright): Append year 2003.
2013 (version): Increase year.
2015 * tests/defs.in: Substitute aclocaldir instead of running
2016 the installed aclocal. Otherwise Libtool and Gettext
2017 tests get skipped when aclocal doesn't preexist.
2019 * tests/listval.test, tests/suffix2.test: Remove pointless -I
2020 argument to aclocal.
2024 Copyright (C) 2003 Free Software Foundation, Inc.
2026 This file is part of GNU Automake.
2028 GNU Automake is free software; you can redistribute it and/or modify
2029 it under the terms of the GNU General Public License as published by
2030 the Free Software Foundation; either version 2, or (at your option)
2033 GNU Automake is distributed in the hope that it will be useful,
2034 but WITHOUT ANY WARRANTY; without even the implied warranty of
2035 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2036 GNU General Public License for more details.
2038 You should have received a copy of the GNU General Public License
2039 along with autoconf; see the file COPYING. If not, write to
2040 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
2041 Boston, MA 02111-1307, USA.