1 2011-01-16 Stefano Lattarini <stefano.lattarini@gmail.com>
3 tests: remove useless requirements from cond36.test
4 * tests/cond36.test ($required): Remove.
5 Since we are at it, add a trailing `:' command.
7 2011-01-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
8 Stefano Lattarini <stefano.lattarini@gmail.com>
10 parallel-tests: work around Tru64/OSF 5.1 sh read bugs.
11 * lib/am/check.am ($(TEST_SUITE_LOG), recheck, recheck-html):
12 Test file readability before redirecting input from it, to avoid
13 exiting Tru64/OSF 5.1 sh which treats read as special builtin.
14 * tests/parallel-tests-unreadable-log.test: New test.
15 * tests/Makefile.am (TESTS): Update.
18 2011-01-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
20 * NEWS, README: Update copyright years.
22 Fix parallel-tests.test failure with HP-UX make.
23 * tests/parallel-tests.test: Sleep inside inner tests, so logs
24 are newer than logs of tests they depend on, for HP-UX make.
26 2011-01-15 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
28 docs: ensure example are separated with empty lines in the input
29 * doc/automake.texi (Extending aclocal, Emacs Lisp, Rebuilding)
30 (API Versioning, Renamed Objects, Multiple Outputs): Add empty
31 lines before `@example' and after `@end example' lines, so info
32 output is rendered correctly, and a following @noindent honored.
33 Report by Stefano Lattarini.
35 2011-01-15 Jim Meyering <meyering@redhat.com>
37 tests: fix comment typo
38 * tests/substref.test: Fix grammar in a comment.
40 2011-01-13 Stefano Lattarini <stefano.lattarini@gmail.com>
42 tests: fix spurious failures in two texinfo tests
43 * tests/txinfo.test ($required): Add 'makeinfo'.
44 * tests/txinfo8.test: Create a dummy 'textutils.info' file, so
45 that make won't try to run makeinfo (which could be unavailable)
47 Found by NixOS Hydra, reported by Ralf Wildenhues.
49 2011-01-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
51 Avoid testsuite failures due to Autoconf Fortran change.
52 Autoconf v2.68-21-g727ce95 causes AC_F77_LIBRARY_LDFLAGS to
53 require computing the canonical host name. Ensure config.guess
54 and config.sub files are present for respective checks.
55 * tests/compile_f_c_cxx.test: Add stub files.
56 * tests/flibs.test: Likewise.
57 * tests/fort4.test: Use $AUTOMAKE -a for installing files.
59 2011-01-12 Stefano Lattarini <stefano.lattarini@gmail.com>
61 docs: clustered '-d' not recognized in YFLAGS
62 This change fixes automake bug#7828.
63 * doc/automake.texi (Yacc and Lex): Document that automake
64 recognizes '-d' in AM_YFLAGS only if it's not clustered with
66 From a report by Юрий Пухальский.
68 2011-01-10 Stefano Lattarini <stefano.lattarini@gmail.com>
70 tests: add checks on automatically-distributed files
71 Related to automake bug#7819.
72 * tests/autodist.test: New test.
73 * tests/autodist-subdir.test: Likewise.
74 * tests/autodist-acconfig.test: Likewise.
75 * tests/autodist-acconfig-no-subdir.test: Likewise.
76 * tests/autodist-aclocal-m4.test: Likewise.
77 * tests/autodist-config-headers.test: Likewise.
78 * tests/autodist-configure-no-subdir.test: Likewise.
79 * tests/autodist-stamp-vti.test: Likewise.
80 * tests/Makefile.am (TESTS): Update.
82 2011-01-11 Stefano Lattarini <stefano.lattarini@gmail.com>
84 tests: work around a texi+cygnus bug causing a spurious XFAIL
85 * tests/txinfo5b.test: New test, like txinfo5.test but calling
86 automake with the `-Wno-override' option to work around a bug
87 in the texinfo + cygnus interaction.
88 * tests/txinfo5.test: Update heading comments.
89 * tests/Makefile.am (TEST): Updated.
91 2011-01-09 Dave Hart <davehart@gmail.com> (tiny change)
93 Fix another typo in Rule.pm comment.
94 * lib/Automake/Rule.pm: Fix typo.
96 2011-01-11 Stefano Lattarini <stefano.lattarini@gmail.com>
98 Improve, extend and tweak tests on Texinfo support.
99 * tests/instdir-texi.test: Add a call to `ls -l' after that to
100 `make', for debugging. When looking for required tools, do not
101 redirect the output of "$tool --help" to /dev/null, and do not
102 uselessly run it in a subshell.
103 * tests/txinfo.test: Rewritten to run autoconf, ./configure and
104 make. All checks moved into Makefile.am.
105 * tests/txinfo8.test: Likewise, and modernize the generated
107 * tests/txinfo2.test: Moved checks into Makefile.am, and other
109 * tests/txinfo5.test: Enable `errexit' shell flag, and related
110 changes. Add trailing `:' command.
111 * tests/txinfo6.test: Likewise, and make grepping of generated
112 Makefile.in stricter.
113 * tests/txinfo7.test: Enable `errexit' shell flag, and related
114 changes. Add trailing `:' command. Do not add unnecessary stuff
116 * tests/txinfo9.test: Verify that more targets which are expected
117 to be generated only once really are. Make grepping less strict,
118 to avoid exposing too much internal details. More minor changes.
119 * tests/txinfo16.test: Add trailing `:'. Prefer cat over echo
120 for appending to configure.in. Updated/fixed heading comments.
121 * tests/txinfo23.test: Likewise, and extended a little by making
122 it check that no info file is created in the $(srcdir).
123 * tests/txinfo24.test: Likewise.
124 * tests/txinfo25.test: Likewise.
125 * tests/txinfo18.test: Add trailing `:'. Prefer cat over echo
126 for appending to configure.in. Also, check that index files are
127 cleaned also by "make clean", not only by "make distclean".
128 * tests/txinfo22.test: Prefer `$me' over hard-coded test name,
129 and added trailing `:' command. This testcase also used to check
130 that automake ignores in-line comments when using variables, but
131 preserves them in the output; these checks (added in commit
132 "Release-1-7f-4-g9177ef8") do not really pertain to this test,
133 so they have been moved ...
134 * tests/comments-in-var-defn.test: ... into this new test.
135 * tests/txinfo4.test: Escape literal dots in grep regexps. Add
136 trailing `:' command.
137 * tests/txinfo29.test: Likewise. Relax grepping of generated
138 Makefile.in w.r.t. whitespaces. Prefer `cat' over `echo' to
139 append to configure.in.
140 * tests/txinfo3.test: Likewise.
141 * tests/vtexi.test: Improve grepping of Makefile.in (sometimes
142 make it stricter, sometimes laxer). Move `set -e' setting just
143 after the inclusion of ./defs. De-uglify a sed command. Other
144 minor cosmetic improvements.
145 * tests/vtexi2.test: Make grepping of Makefile.in stricter. Add
146 trailing `:' command.
147 * tests/vtexi3.test: New test on version.texi support.
148 * tests/vtexi4.test: Likewise.
149 * tests/Makefile.am (TESTS): Updated.
151 2011-01-09 Peter Rosin <peda@lysator.liu.se>
153 Fix another typo in Rule.pm comment.
154 * lib/Automake/Rule.pm: Fix typo.
156 2011-01-09 Stefano Lattarini <stefano.lattarini@gmail.com>
158 cosmetics: remove trailing whitespaces
159 * doc/automake.texi: Remove trailing whitespaces.
160 * tests/cond13.test: Likewise.
161 * tests/cond14.test: Likewise.
162 * tests/fort4.test: Likewise.
163 * tests/fort5.test: Likewise.
164 * tests/suffix7.test: Likewise.
165 * tests/vtexi2.test: Likewise.
167 automake: minor fixes in comments
168 * automake.in: Some minor fixes and enhancements in comments.
170 2011-01-09 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
172 Add test coverage for deleted header files.
173 * tests/depcomp6.test, tests/depcomp7.test: Update tests to
174 also check for the deleted header bug. If no dependency
175 tracking mechanism could be found, SKIP rather than exit
176 successfully. Use GNU style spacing and ANSI C prototypes.
178 Fix typos in Rule.pm comments.
179 * lib/Automake/Rule.pm: Fix typos in comments.
181 docs: split 'amhello Explained' node.
182 * doc/automake.texi (amhello Explained): Split node ...
183 (amhello's configure.ac Setup Explained)
184 (amhello's Makefile.am Setup Explained) : ... into these two.
185 (Top, Hello World): Adjust, and add @anchor for stable URL links.
186 Suggestion by Karl Berry in automake bug#7766.
188 2011-01-08 Karl Berry <karl@freefriends.org>
189 Eric Blake <eblake@redhat.com>
191 docs: reference defining directories in amhello node.
192 * doc/automake.texi (amhello Explained): Point to Autoconf
193 manual for how to convert directory values into macros.
194 (Optional): Fix grammar nit.
196 2011-01-02 Stefano Lattarini <stefano.lattarini@gmail.com>
198 * NEWS: Fix typo (forgotten word).
200 2011-01-02 Stefano Lattarini <stefano.lattarini@gmail.com>
201 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
203 docs: how to work around checks on invalid primary/directory couples
204 * doc/automake.texi (Uniform): Document the blessed idiom which can
205 be used to work around automake checks on invalid primary/directory
206 couples (such as `lib_PROGRAMS' or `doc_LIBRARIES').
208 2011-01-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
210 Sync auxiliary files from upstream.
211 * lib/config.guess, lib/config.sub, lib/texinfo.tex:
214 Fix maintainer-check regression.
215 * tests/subobj11a.test: Pass DISTCHECK_CONFIGURE_FLAGS in the
218 Bump copyright years.
219 * aclocal.in (write_aclocal, version): Bump copyright years.
220 * automake.in (gen_copyright, version): Likewise.
221 * doc/automake.texi: Likewise.
223 2010-12-23 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
224 Stefano Lattarini <stefano.lattarini@gmail.com>
226 Work around a bug in file-inclusion mechanism of Solaris make.
227 * automake.in (handle_single_transform): In the name of the
228 dependency file: collapse multiple slash characters into a single
230 * tests/subobj11a.test: New test.
231 * tests/subobj11b.test: Likewise.
232 * tests/subobj11c.test: Likewise.
233 * tests/depcomp8a.test: Likewise.
234 * tests/depcomp8b.test: Likewise.
235 * tests/Makefile.am (TESTS): Updated.
237 Report by Stefano Lattarini, quick fix by Ralf Wildenhues, final
238 patch and tests by Stefano Lattarini.
240 2010-12-22 Stefano Lattarini <stefano.lattarini@gmail.com>
242 Fix two spurious testsuite failures on IRIX 6.5.
243 * tests/suffix13.test (Makefile.am): Account for VPATH issues on
244 weaker make implementations (e.g. IRIX 6.5).
245 * tests/parallel-tests8.test: Likewise, plus a required related
247 Reported by Ralf Wildenhues. The bugs have been there from the
248 first versions of the affected test scripts.
250 2010-12-22 Stefano Lattarini <stefano.lattarini@gmail.com>
252 docs: cygnus mode doesn't require AM_CYGWIN32 macro.
253 * doc/automake.texi (Cygnus): Mode 'cygnus' does not require
254 the AM_CYGWIN32 macro (and indeed hasn't required it since at
255 least commit Release-1-2-31-g3038064 "merged changes from
256 Cygnus" of 1997-08-25).
258 2010-12-22 Stefano Lattarini <stefano.lattarini@gmail.com>
260 distlinksbrk.test: Work around botched "make -k".
261 * tests/distlinksbrk.test: Run "make" multiple times and grep
262 its output each time for a single error message, rather than
263 running "make -k" one single time and grepping its output for
264 all the expected error messages. This should work around make
265 implementations with limited (broken?) `-k' support; for more
266 information, see these subthreads on the automake-patches list:
267 - 2010-11-15, "Testsuite failures on HP-UX 11.23",
268 <http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00162.html>
269 - 2010-11-15, "Testsuite failures on IRIX 6.5",
270 <http://lists.gnu.org/archive/html/automake-patches/2010-11/msg00166.html>
272 2010-12-21 Stefano Lattarini <stefano.lattarini@gmail.com>
274 Fix sed-related buglet in test "subdir5.test"
275 * tests/subdir5.test: Always terminate text passed to the
276 `i' sed command with a newline, to work around limitations
277 in e.g. older OpenBSD sed.
279 2010-12-18 Stefano Lattarini <stefano.lattarini@gmail.com>
281 docs: fix blunder in example about python extension modules
282 * doc/automake.texi (Python): Use `quaternion_la_SOURCES',
283 not `quaternion_SOURCES', to declare the sources of python
284 extension module `quaternion.la'.
286 2010-12-16 Stefano Lattarini <stefano.lattarini@gmail.com>
288 docs: list LTLIBRARIES among Automake primaries
289 * doc/automake.texi (Uniform): List `LTLIBRARIES' among
290 the Automake primaries.
292 2010-12-14 Stefano Lattarini <stefano.lattarini@gmail.com>
294 Improve tests on generated portions of configure help screen.
295 * tests/help-depend.test: Grepping of configure help screen
296 relaxed to cater for possible line wrapping, and tightened in
298 * tests/help-depend2.test: Likewise.
299 * tests/help-dmalloc.test: Likewise.
300 * tests/help-lispdir.test: Likewise.
301 * tests/help-maintainer.test: Likewise.
302 * tests/help-multilib.test: Likewise.
303 * tests/help-silent.test: Likewise.
304 * tests/help-upc.test: Likewise.
305 * tests/help-init.test: Grepping of configure help screen
308 2010-12-10 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
310 Avoid running installed automake from 'libtool --help'.
311 * tests/subobj9.test: Export AUTOCONF and AUTOMAKE.
312 Together with fixed Libtool, this fixes check-coverage to not
313 invoke installed automake.
315 2010-11-25 Stefano Lattarini <stefano.lattarini@gmail.com>
317 Fix spurious failures in `silent*.test' for $CC != gcc
318 In some tests on automake-produced silent rules, we forced the
319 use of gcc depmode to improve testsuite coverage; but this has
320 unsurprisingly led to spurious failures when some non-GNU C
321 compilers were used. So we are now careful to require GCC in
322 tests that force gcc depmode.
323 From reports by Ralf Wildenhues.
324 * silent5.test: Test removed, its content split into ...
325 * silent-many-generic.test, silent-many-gcc.test: ... these new
326 sister tests, the latter of which forces gcc depmode and lists
328 * silentlex.test: Test removed, its content split into ...
329 * silent-lex-generic.test, silent-lex-gcc.test: ... these new
330 sister tests, the latter of which forces gcc depmode and lists
332 * silentyacc.test: Test removed, its content split into ...
333 * silent-yacc-generic.test, silent-yacc-gcc.test: ... these new
334 sister tests, the latter of which forces gcc depmode and lists
336 * tests/Makefile.am (TESTS): Updated.
338 2010-11-21 Stefano Lattarini <stefano.lattarini@gmail.com>
340 Tests: consistently use "|| Exit 1" after ". ./defs".
341 * tests/autohdr.test: Use `. ./defs || Exit 1', not bare
342 `. ./defs', for consistency with other tests.
343 * tests/autohdr2.test: Likewise.
344 * tests/autohdr3.test: Likewise.
345 * tests/autohdr4.test: Likewise.
346 * tests/cond23.test: Likewise.
347 * tests/cond24.test: Likewise.
348 * tests/cond25.test: Likewise.
349 * tests/cond26.test: Likewise.
350 * tests/cond27.test: Likewise.
351 * tests/cond28.test: Likewise.
352 * tests/cond29.test: Likewise.
353 * tests/cond30.test: Likewise.
354 * tests/cond31.test: Likewise.
355 * tests/cond32.test: Likewise.
356 * tests/cond33.test: Likewise.
357 * tests/cond34.test: Likewise.
358 * tests/cond35.test: Likewise.
359 * tests/cond36.test: Likewise.
360 * tests/cond37.test: Likewise.
361 * tests/cond38.test: Likewise.
362 * tests/cond39.test: Likewise.
363 * tests/cond40.test: Likewise.
364 * tests/cond41.test: Likewise.
365 * tests/cond42.test: Likewise.
366 * tests/cond43.test: Likewise.
367 * tests/cond44.test: Likewise.
368 * tests/cond45.test: Likewise.
369 * tests/dollarvar.test: Likewise.
370 * tests/dollarvar2.test: Likewise.
371 * tests/hfs.test: Likewise.
372 * tests/libobj14.test: Likewise.
373 * tests/percent.test: Likewise.
374 * tests/percent2.test: Likewise.
375 * tests/phony.test: Likewise.
376 * tests/silent.test: Likewise.
377 * tests/silent2.test: Likewise.
378 * tests/silent3.test: Likewise.
379 * tests/silent4.test: Likewise.
380 * tests/silent5.test: Likewise.
381 * tests/silent6.test: Likewise.
382 * tests/silent7.test: Likewise.
383 * tests/silent9.test: Likewise.
384 * tests/silentcxx.test: Likewise.
385 * tests/silentf77.test: Likewise.
386 * tests/silentf90.test: Likewise.
387 * tests/silentlex.test: Likewise.
388 * tests/silentyacc.test: Likewise.
390 Avoid useless cleaning in some `silent*.test' tests.
391 * tests/silentf77.test: Removed useless calls to "make clean"
392 and "make maintainer-clean".
393 * tests/silentf90.test: Likewise.
394 * tests/silent3.test: Removed useless call to "make distclean".
395 * tests/silent4.test: Likewise.
396 * tests/silent9.test: Likewise.
398 2010-11-19 Ian Lance Taylor <iant@google.com>
400 Sync config-ml.in from GCC.
401 * config-ml.in: Add Go support: treat GOC and GOCFLAGS like other
402 compiler/flag environment variables.
404 2010-11-19 Stefano Lattarini <stefano.lattarini@gmail.com>
406 Automake::Config: remove extra trailing semicolon.
407 * lib/Automake/Config.in: Remove extra trailing semicolon.
409 help4.test: fix botched heading comment.
410 * tests/help4.test: Fixed the heading comment, since it
411 didn't correctly describe what checks the testcase was
414 help2.test: add checks on aclocal too.
415 * tests/help2.test: Check that also `aclocal --version' and
416 `aclocal --help' work with configure.in and acinclude.m4 both
419 2010-11-17 Stefano Lattarini <stefano.lattarini@gmail.com>
421 Fix spurious failures of silent-rules tests with Sun Fortran.
422 * tests/silentf77.test: Strip from the make output some verbose
423 messages possibly printed by the SunStudio fortran compilers, to
424 avoid spurious failures. Add a trailing `:' command.
425 * tests/silentf90.test: Likewise.
427 2010-11-17 Stefano Lattarini <stefano.lattarini@gmail.com>
429 Fix spurious failures of silent5.test with Sun Fortran.
430 * tests/silent5.test: Strip from the make output some verbose
431 messages possibly printed by the SunStudio fortran compilers,
432 to avoid spurious failures. This bug has been there from the
433 very first version of this test script.
435 2010-11-16 Stefano Lattarini <stefano.lattarini@gmail.com>
437 Fix regression in colon{5,6}.test (failures on AIX 5.3).
438 * tests/colon5.test: Also substitute `@SHELL@' with `$SHELL' when
439 post-processing the generated Makefile.in, to work around a bug
440 of AIX 5.3 make which doesn't allow setting the `$(SHELL)' macro
441 on the commend line. Calls to `$MAKE' adjusted accordingly.
442 * tests/colon6.test: Likewise.
443 Regression introduced in commit v1.11-175-gf9fe878 "Modernize,
444 improve and/or extend tests `colon*.test", and reported by Ralf
447 2010-11-16 Stefano Lattarini <stefano.lattarini@gmail.com>
449 Fix regression in ansi.test (failure on AIX 5.3).
450 * tests/ansi.test: Remove redundant hackish check done using a
451 hand-postprocessed Makefile.in. This check worked by setting
452 the `$(SHELL)' macro on the command line of make, but this is
453 not supported by the AIX 5.3 make implementation.
454 This bug has been lurking for a long time, and was activated by
455 commit v1.11-125-gc1f6cdb "Enable `errexit' shell flag in various
456 tests". Report by Ralf Wildenhues.
458 2010-11-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
460 tests: avoid '##'-style comments inside recipe commands.
461 * tests/confh.test, tests/confh8.test: Remove
462 double-hash comments from makefile rule commands, they
463 are not part of the Automake API.
465 2010-11-14 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
467 tests: work around dash quoting issue in case statements.
468 * tests/color.test, tests/color2.test: Quote variable in case
469 pattern, to avoid skipping tests with dash 0.5.5.1.
471 2010-11-14 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
473 Rebuild menus in the manual.
474 * doc/automake.texi: Rebuild menus (using ^C ^U ^A in emacs).
475 Thanks to Ian Lance Taylor for the suggestion.
477 Fix install-strip when $(STRIP) contains several words.
478 * lib/am/install.am (install-strip): Update comment. Use
479 separate sub-make invocations for empty and nonempty $(STRIP),
480 to fix quoting issues.
481 * tests/strip2.test, tests/strip3.test: New tests.
482 * tests/Makefile.am (TESTS): Adjust.
484 2010-11-10 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
486 Fix yaccdry.test failure: require bison.
487 * tests/yaccdry.test: Require bison.
488 Found by NixOS Hydra.
490 2010-11-07 Stefano Lattarini <stefano.lattarini@gmail.com>
492 Fix a bug in variable concatenation with `+='.
493 * lib/Automake/VarDef.pm (append): Since the content of the
494 "appended-to" variable is going to be unconditionally normalized
495 later, simply separate the appended value with a single whitespace
496 character, instead of trying to be uselessly smarter by using
497 escaped newlines. This fixes a bug in which extra backslashes
498 where erroneously inserted in the variable's final value.
499 * tests/pluseq11.test: New test, exposing the bug.
500 * tests/Makefile.am (TESTS): Update.
501 Reported by Andy Wingo.
503 2010-11-06 Stefano Lattarini <stefano.lattarini@gmail.com>
505 Fix bug in rules for creating vala vapi/header files.
506 * automake.in (lang_vala_finish_target): Add forgotten "fi" in an
507 if control structure in a generated make rules. Bug introduced
508 by previous commit `v1.11-221-gd7c1679', and revealed by failure
509 of test `vala2.test'.
511 2010-11-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
513 Fix and document rules to not touch the tree with `make -n'.
514 * doc/automake.texi (Multiple Outputs): Document the problem of
515 modifications during dry-run execution, propose solution.
517 * automake.in (lang_vala_finish_target): Split recipe so the
518 stamp file is not removed with GNU `make -n'.
519 (lang_yacc_target_hook): Separate removal of parser output file
521 * lib/am/lisp.am ($(am__ELCFILES)): Determine whether -n was
522 passed to make, take care not to remove any files in that case.
523 * lib/am/remake-hdr.am (%CONFIG_H%): Separate removal of
524 %STAMP% file from induced remaking of config header.
525 * tests/autohdrdry.test, tests/lispdry.test, tests/yaccdry.test:
527 * tests/Makefile.am (TESTS): Update.
529 2010-11-01 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
531 Add FAQ entry for bug reporting instructions.
532 * doc/automake.texi (Reporting Bugs): New section.
533 (Introduction): Refer to it.
535 2010-10-04 Stefano Lattarini <stefano.lattarini@gmail.com>
537 Add support for newer python versions.
538 * m4/python.m4 (AM_PATH_PYTHON): Add python2.7 and python3.2 to
539 _AM_PYTHON_INTERPRETER_LIST. Since we are at it, break a long
540 line and fix indentation.
542 From a report by Thomas Klausner.
544 Add test for `AM_WITH_DMALLOC' macro.
545 * tests/dmalloc.test: New test.
546 * tests/Makefile.am (TESTS): Update.
548 Fix nits and bugs in tests `help*.test'.
549 * tests/help4.test: Fix broken sed commands used to strip `-W...'
550 flags away from "$AUTOMAKE" and "$ACLOCAL".
551 * tests/help3.test: Likewise, and fix a botched comment.
552 * tests/help.test: Likewise. Also, use "AUTOMAKE_fails ..."
553 instead of "$AUTOMAKE ... && Exit 1", for consistency and to
554 please maintainer-check.
555 * tests/help2.test: Likewise.
557 2010-10-03 Stefano Lattarini <stefano.lattarini@gmail.com>
558 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
560 Improve tests `help*.test' (also fixes maintcheck failures).
561 * tests/help.test: To run automake, use `$AUTOMAKE' with all `-W'
562 flags stripped away rather than hard-coded `automake-$APIVERSION',
563 to better honour user-overrides. Similarly for aclocal.
564 * tests/help2.test: Likewise.
565 * tests/help3.test: Likewise.
566 * tests/help4.test: Likewise.
568 2010-10-03 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
570 Document and fix expansion of variables before rules.
571 * doc/automake.texi (General Operation): Document that variables
572 are expanded before rules.
573 * lib/am/check.am (am__check_post): Reword a bit so it does not
574 get matched as a rule.
575 Suggestion by Ben Pfaff.
577 2010-10-02 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
579 Revert "parallel-tests: avoid command-line length limit issue."
580 This reverts commit 24e3b4ee2f8cb9f72dd94a05a893f3d4e88b7835,
581 because it re-opened the bug fixed by v1.11-10-g218e678.
583 2010-09-07 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
585 parallel-tests: avoid command-line length limit issue.
586 * automake.in (handle_tests): New argument $makefile, new
587 substitution %MAKEFILE%.
588 (generate_makefile): Adjust.
589 * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
590 sanitized TEST_LOGS value as makefile snippet on standard
591 input to $(MAKE), to avoid exceeding the command line limit on
594 Report by Bob Friesenhahn.
596 2010-09-26 Stefano Lattarini <stefano.lattarini@gmail.com>
598 Extend tests on `--help' and `--version' options.
599 * tests/help.test: Create a new empty directory and chdir into
600 it, rather than removing already present files. Run the aclocal
601 and automake wrapper scripts directly, instead of relying on
602 $AUTOMAKE and $ACLOCAL. Be sure to correctly match literal dots
603 in aclocal's and automake's stderr. Add a trailing `:' command.
604 * tests/help2.test: New test, checking that options `--help' and
605 `--version' works in directories with broken `configure.in'.
606 * tests/help3.test: New test, checking that options `--help' and
607 `--version' take precedence on the other options.
608 * tests/help4.test: New test, checking that the first among the
609 `--help' and `--version' options to be specified on the command
611 * tests/Makefile.am (TESTS): Updated.
613 2010-09-25 Stefano Lattarini <stefano.lattarini@gmail.com>
615 Testsuite: Use `$PATH_SEPARATOR', not `:', when extending PATH.
616 * tests/compile2.test: Do no uselessly (implicitly) repeat the
617 computation of PATH_SEPARATOR again.
618 * tests/instmany-mans.test: Use `$PATH_SEPARATOR', not `:', when
619 extending/redefining PATH.
620 * tests/instmany-python.test: Likewise.
621 * tests/instmany.test: Likewise.
622 * tests/man4.test: Likewise.
623 * tests/mkinst3.test: Likewise.
624 * tests/mmodely.test: Likewise.
625 * tests/multlib.test: Likewise.
626 * tests/txinfo30.test: Likewise.
627 * tests/README (Section "Writing test cases" subsection "Do"):
629 * Makefile.am (sc_tests_PATH_SEPARATOR): New maintainer check.
630 (syntax_check_rules): Updated.
632 Testsuite: new variables `$PATH_SEPARATOR' and `$APIVERSION'.
633 * tests/defs.in ($APIVERSION): New AC_SUBST'd variable.
634 ($ACLOCAL, $AUTOMAKE): Use it.
635 ($PATH_SEPARATOR): New AC_SUBST'd variables.
638 2010-09-22 Stefano Lattarini <stefano.lattarini@gmail.com>
640 Manual: be more agnostic w.r.t. version control system used.
641 * doc/automake.texi (Basics of Distribution): Also refer to `.svn'
642 directories as a type of probably-unwanted files that are copied
643 regardless when adding directories to EXTRA_DIST.
644 (The dist Hook): Show a dist-hook example which removes Subversion
645 `.svn' private directories from distdir, rather than CVS private
647 (missing and AM_MAINTAINER_MODE): Try to be more agnostic w.r.t.
648 the version control system used.
650 Manual: index refer to target "git-dist", not "cvs-dist".
651 * doc/automake.texi (General Operation): Index the non-standard
652 example about "git-dist" under the "git-dist" label, not under
655 Perl modules: remove references to "Automake CVS repository".
656 * lib/Automake/Channels.pm: Update comments to refer to "Automke's
657 git repository" rather than to "Automake's CVS repository".
658 * lib/Automake/Configure_ac.pm: Likewise.
659 * lib/Automake/FileUtils.pm: Likewise.
660 * lib/Automake/Struct.pm: Likewise.
661 * lib/Automake/XFile.pm: Likewise.
662 * lib/Automake/Version.pm (=head1 DESCRIPTION): Refer to "git
663 branches" rather than "CVS branches".
665 Remove obsolete .cvsignore files.
666 * .cvsignore, doc/.cvsignore, lib/.cvsignore, lib/am/.cvsignore,
667 lib/Automake/.cvsignore, lib/Automake/tests/.cvsignore,
668 m4/.cvsignore, tests/.cvsignore: Files deleted. Even when using
669 savannah's CVS readonly mirror there's no way to commit back to
670 the real repository, so this files are not worth maintaining or
673 2010-09-21 Stefano Lattarini <stefano.lattarini@gmail.com>
675 * m4/dmalloc.m4: Bump serial number and copyright years.
677 2010-09-20 Stefano Lattarini <stefano.lattarini@gmail.com>
679 Fix broken link in `AM_WITH_DMALLOC' help screen.
680 * m4/dmalloc.m4 (AM_WITH_DMALLOC): Refer only to the dmalloc site
681 `http://www.dmalloc.com', not to the dmalloc tarball there (which
682 seems to have been removed, substituted by multiple release
685 2010-09-17 Eric Blake <eblake@redhat.com>
687 Avoid triple-space after period.
688 * automake.in (handle_single_transform): Avoid 3 spaces at
690 * ChangeLog.03: Likewise.
691 * lib/Automake/ChannelDefs.pm: Likewise.
692 * lib/Automake/Channels.pm (_print_message): Likewise.
693 * lib/Automake/Rule.pm (rule): Likewise.
694 * lib/Automake/Variable.pm (var): Likewise.
695 * lib/am/distdir.am: Likewise.
696 * tests/insthook.test: Likewise.
698 2010-09-15 Stefano Lattarini <stefano.lattarini@gmail.com>
700 Test automake-generated portions of configure help screen.
701 * tests/help-depend.test: New test.
702 * tests/help-depend2.test: Likewise.
703 * tests/help-dmalloc.test: Likewise.
704 * tests/help-init.test: Likewise.
705 * tests/help-lispdir.test: Likewise.
706 * tests/help-maintainer.test: Likewise.
707 * tests/help-multilib.test: Likewise.
708 * tests/help-regex.test: Likewise.
709 * tests/help-silent.test: Likewise.
710 * tests/help-upc.test: Likewise.
711 * tests/mmode.test: Remove tests on `configure --help' output,
712 they are superseded by tests in `help-maintainer.test'.
713 * tests/Makefile.am (TESTS): Update.
715 2010-09-14 Stefano Lattarini <stefano.lattarini@gmail.com>
717 * tests/README: Don't put GCS mandated tools in $required.
719 2010-09-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
721 * HACKING: Hint at old commits with `git describe' output.
723 2010-09-12 Stefano Lattarini <stefano.lattarini@gmail.com>
725 Fix regression in test `colon4.test'.
726 * tests/colon4.test: Fix botched editing to `configure.in'
727 that made the test useless. Since we are at it, improve
728 comments and make grepping of generated Makefile.in slightly
730 Regression introduced by change "Modernize, improve and/or
731 extend tests `colon*.test" (Stefano Lattarini, 2010-08-08).
733 2010-09-08 Stefano Lattarini <stefano.lattarini@gmail.com>
735 Do not require "gzip" explicitly in tests.
736 The gzip utility is simply expected to be present on any decent
737 target system for Automake. So it's pointless to put it in
739 * tests/install2.test ($required): Do not require "gzip".
740 * tests/lex3.test: Likewise.
741 * tests/pr9.test: Likewise.
742 From a suggestion by Ralf Wildenhues.
744 Make some `confh*.test' tests more "semantic" (plus tweakings).
745 * tests/confh.test: Run "autoconf", "configure" and "make check",
746 instead of munging/grepping the generated `Makefile.in'.
747 * tests/confh4.test: Relax the grepping of Makefile.in w.r.t.
748 white spaces. Do not create useless dummy source file `foo.c'
749 and useless dummy header file `acconfig.h'.
750 (configure.in): Remove superfluous call to `AC_OUTPUT'.
751 * tests/confh6.test: Add trailing `:' command.
752 * tests/confh7.test: In comments, add reference to ...
753 * tests/confh8.test: ... this new test, "semantic" sister
755 * tests/Makefile.am (TESTS): Updated.
756 Prompted by a report from Ralf Wildenhues.
758 Remove useless whitespace padding in XFAIL_TESTS definition.
759 * tests/Makefile.am (XFAIL_TESTS): Remove whitespace padding.
761 2010-09-07 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
763 parallel-tests: avoid command-line length limit issue.
764 * automake.in (handle_tests): New argument $makefile, new
765 substitution %MAKEFILE%.
766 (generate_makefile): Adjust.
767 * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Pass
768 sanitized TEST_LOGS value as makefile snippet on standard
769 input to $(MAKE), to avoid exceeding the command line limit on
772 Report by Bob Friesenhahn.
774 Posix 2008 requires make to set errexit.
775 * lib/am/check.am: Update comment.
777 2010-08-27 Stefano Lattarini <stefano.lattarini@gmail.com>
779 Fix bug in test missing6.test.
780 * tests/missing6.test: Fix the hack used to edit `configure.in',
781 to avoid producing a configure script that breaks with shells
782 that do not support $LINENO. Also throw in a couple of cosmetic
785 2010-08-21 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
787 Improve robustness of mdate-sh script.
788 * lib/mdate-sh: Sanitize zsh behavior on startup, to ensure
789 $ls_command is word-split properly upon invocation.
790 (error): New function.
791 (main): Use it. Improve error checking to avoid endless loop
792 in case $ls_command gave bogus output. Fix eval quotation.
793 * tests/mdate6.test: New test, to expose eval quotation error.
794 * tests/Makefile.am: Update.
796 2010-08-18 Stefano Lattarini <stefano.lattarini@gmail.com>
798 Fix potential regressions in depcomp{3,5}.test.
799 * tests/depcomp3.test: Do not uselessly escape the character `$'
800 in makefile rules, when it's used to expand a make macro.
801 * tests/depcomp5.test: Likewise.
803 2010-08-17 Stefano Lattarini <stefano.lattarini@gmail.com>
804 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
806 Docs: clarify how to avoid automatic dependencies tracking.
807 * doc/automake.texi (Automatic dependency tracking): Mention that
808 automatic dependencies tracking is enabled by default, but that
809 the package developer can disable it altogether. Add a reference
810 to the proper section for a more in-depth explanation.
812 Fix typo in manual (`Makefile.in' instead of `Makefile.am').
813 * doc/automake.texi (Automatic dependency tracking): Fix typo.
815 2010-08-16 Bruno Haible <bruno@clisp.org>
817 Don't hide the table of contents.
818 * doc/automake.texi: Move the table of contents to the beginning.
820 2010-08-10 Stefano Lattarini <stefano.lattarini@gmail.com>
822 Tweak and/or extend some `acloca*.test' tests.
823 * tests/aclocal8.test: Ensure verbose printing of captured
825 * tests/aclocal.test: Likewise. Also, add trailing `:'
827 * tests/acloca19.test: Likewise.
828 * tests/aclocal5.test: Add trailing `:' command, and prefer
829 `$me' over hard-coded test name.
830 * tests/aclocal6.test: Likewise.
831 * tests/aclocal18.test: Add trailing `:' command, and make
832 some grepping slightly stricter.
833 * tests/acloca14.test: Likewise. Also, prefer `diff' over
834 `cmp', and add some "cosmetic" blank lines.
836 2010-08-09 Stefano Lattarini <stefano.lattarini@gmail.com>
838 Tweak and extend tests `pr[!0-9]*.test'.
839 * tests/primary3.test: Add trailing `:' command.
840 * tests/primary.test: Make grepping of Automake's stderr stricter.
841 Also, add trailing `:' command, and cosmetic changes in spacing.
842 * tests/primary2.test: Likewise.
843 * tests/prefix.test: Enable `errexit' shell flags, and related
844 changes. Add a trailing `:' command.
845 * tests/proginst.test: Likewise.
847 Modernize, improve and extend tests for PR (`pr[0-9]*.test').
848 * tests/pr2.test: Add trailing `:' command.
849 * tests/pr229.test: Likewise.
850 * tests/pr401.test: Likewise.
851 * tests/pr401b.test: Likewise.
852 * tests/pr401c.test: Likewise.
853 * tests/pr300-prog.test: Likewise, plus cosmetic changes in
855 * tests/pr300-lib.test: Likewise.
856 * tests/pr300-ltlib.test: Likewise, and ensure verbose printing
857 of captured make stdout.
858 * tests/pr211.test: Add trailing `:' command. Also, use the
859 `configure.in' stub created by ./defs, rather than writing it
861 * tests/pr204.test: Likewise, plus cosmetic spacing changes.
862 * tests/pr287.test: Likewise, and move setting of `errexit' shell
863 flag earlier in the script (just after inclusion of ./defs).
864 * tests/pr220.test: Make grepping of Automake's stderr stricter.
865 Also, add trailing `:' command, and cosmetic changes in spacing.
866 * tests/pr224.test: Move setting of `errexit' shell flag earlier
867 in the script (just after inclusion of ./defs). Do not export
868 `CC=gcc' to configure explicitly (it's already exported globally
869 in ./defs, since we have "gcc" in $required). Use the stub for
870 `configure.in' created by ./defs, rather than writing it from
871 scratch. Do not create dummy files required by "gnu" mode (e.g.
872 README, NEWS), since we run automake in foreign mode anyway.
873 * tests/pr72.test: Enable `errexit' shell flags, and related
874 changes. Extend existing checks a bit.
875 * tests/pr9.test: Likewise. Also, avoid obsolescent constructs in
876 the generated `configure.in', and extend existing checks over the
877 generated tarball a bit.
878 * tests/pr87.test: Enable `errexit' shell flags, and related
879 changes. Add a trailing `:' command. Also, do not create dummy
880 files required by "gnu" mode (e.g. README, NEWS), since we run
881 automake in foreign mode anyway.
882 * tests/pr243.test: Avoid obsolescent constructs in the generated
883 `configure.in'. Enable the `errexit' shell flag, and related
884 changes. Cosmetic changes to spacing, add trailing `:' command,
885 and add a "FIXME" comment.
886 * tests/pr266.test: Likewise, and add explicit command line switch
887 `--enable-dependecy-tracking' to the ./configure call.
888 * tests/pr279.test: Avoid obsolescent constructs in the generated
889 `configure.in'; also, use the `configure.in' stub created by
890 ./defs, rather than writing it from scratch. Enable `errexit'
891 shell flag, and related changes. Add trailing `:' command.
892 * tests/pr279-2.test: Likewise, and make grepping of Makefile.in
894 * tests/pr307.test: Move setting of `errexit' shell flag earlier
895 in the script (just after inclusion of ./defs). Escape literal
896 dots in grep regular expressions. Also, add a trailing `:'
897 command, and cosmetic changes to spacing.
899 Tests for PR: add excerpts from original bug report, for clarity.
900 * tests/pr2.test: Ditto.
901 * tests/pr9.test: Likewise.
902 * tests/pr72.test: Likewise.
903 * tests/pr87.test: Likewise.
904 * tests/pr211.test: Likewise.
905 * tests/pr220.test: Likewise.
906 * tests/pr224.test: Likewise.
907 * tests/pr229.test: Likewise.
908 * tests/pr243.test: Likewise.
909 * tests/pr266.test: Likewise.
910 * tests/pr279.test: Likewise, and tell to keep it in sync
911 with its sister test.
912 * tests/pr279-2.test: Likewise.
914 2010-08-08 Stefano Lattarini <stefano.lattarini@gmail.com>
916 Tweak, extend and improve tests `cond[a-z]*.test'.
917 * tests/condd.test: Add trailing `:' command. Typofix in
919 * tests/condhook.test: Make sure target `install-data-hook' is
920 not called by `make install', but that data files are installed.
921 Use proper m4 quoting in configure.in. Add trailing `:' command.
922 * tests/condhook2.test: New test, sister test of condhook, with
924 * tests/condinc2.test: Use proper m4 quoting in configure.in.
925 Prefer trailing `:' command over trailing `Exit 0'.
926 * tests/condman2.test: Enable errexit shell flag, and related
927 changes. Add trailing `:' command.
928 * tests/condman.test: Likewise. Also, do not create useless
929 dummy manpages, and use proper m4 quoting in configure.in.
930 * tests/condman3.test: New test, similar to condman.test, but
931 it also runs ./configure and "make install", and check the
933 * tests/Makefile.am (TESTS): Updated.
935 Modernize, improve and/or extend tests `colon*.test.
936 * tests/colon.test: Rely on the `configure.in' stub created by
937 `./defs', rather than writing one from scratch. Do not create
938 a useless dummy file. Add trailing `:' command.
939 * tests/colon4.test: Enable the `errexit' shell flag, and
940 related changes. Rely on the `configure.in' stub created by
941 `./defs', rather than writing one from scratch.
942 * tests/colon7.test: Enable `errexit' shell flag, and related
943 changes. Improve the generated `configure.in' file. Add
944 trailing `:' command.
945 * tests/colon2.test: Likewise. Also, add some new checks.
946 * tests/colon5.test: Improve the generated `configure.in' file.
947 Add new, much deeper checks. Add trailing `:' command.
948 * tests/colon6.test: Likewise.
949 * tests/colon3.test: Add trailing `:' command. Remove useless
950 comments and echos. Improve the generated `configure.in' file.
951 make some grepping tests stricter. Add a "FIXME" comments about
952 planned improvements.
954 Improve and extend tests `asm*.test'.
955 * tests/asm.test: Use configure.in stub generated by ./defs,
956 and avoid obsoleted autoconf constructs. Make grepping of
957 Automake stderr stricter. Do not create useless source file.
958 Improve verbose messages. Minor cosmetic changes. Tell to
959 keep it in sync with other sister tests asm*.test.
960 * tests/asm2.test: Likewise.
961 * tests/asm3.test: Likewise.
963 Modernize, improve and/or extend test scripts `conf*.test'.
964 * tests/confh5.test: Cosmetic changes.
965 * tests/conff.test: Likewise.
966 * tests/confdeps.test: Likewise.
967 * tests/conflnk.test: Likewise.
968 * tests/conflnk2.test: Likewise.
969 * tests/confsub.test: Likewise.
970 * tests/confvar.test: Likewise, and make grepping of Makefile.in
972 * tests/confvar2.test: Likewise.
973 * tests/conflnk3.test: Cosmetic changes. Re-enable a temporarily
974 disabled test (which didn't work with autoconf <= 2.59, but now we
975 are requiring autoconf 2.62, so...)
976 * tests/conflnk4.test: Cosmetic changes, and extend existing tests
977 accordingly to "TODO" comments.
978 * tests/conff2.test: Make grepping of Automake's stderr stricter.
979 Add some comments explaining why we don't use the `configure.in'
980 stub preset be ./defs.
981 * tests/confh.test: Use the `configure.in' stub created by ./defs,
982 rather than writing one from scratch, and do not call AC_OUTPUT.
983 Enable `errexit' shell flag, and related changes. Prefer diff over
984 cmp to compare text files. Prefer perl over sed to fetch the value
985 of $(DIST_COMMON) from Makefile.in. Make grepping of the contents
986 of $(DIST_COMMON) stricter.
987 * tests/confh4.test: Use the `configure.in' stub created by ./defs,
988 rather than writing one from scratch. Make grepping of Makefile.in
990 * tests/confh5.test: Make grepping of `config.h' stricter. Add a
992 * tests/configure.test: Avoid obsolescent constructs in generated
993 `configure.ac'. Do not write `configure.in' two times. Escape
994 literal dots in grep regular expressions.
995 * tests/confincl.test: Enable `errexit' shell flag, and related
996 changes. Prefer fgrep over grep. Other cosmetic changes.
997 * tests/config.test: Renamed to ...
998 * tests/confh6.test: ... this. Fix m4 quoting in `configure.in',
999 and make grepping of `config.h' and `config.h.in' stricter.
1000 * tests/conf2.test: Renamed ...
1001 * tests/confh7.test: ... to this. Use the `configure.in' stub
1002 created by ./defs, rather than writing one from scratch. Try to
1003 run the checks both with and without AC_PROG_CC and AC_OUTPUT in
1005 * tests/Makefile.am (TESTS): Updated.
1007 Minor improvements and fixes in tests `depcomp*.test'.
1008 * tests/depcomp.test: Do not create useless dummy source files.
1009 Add a trailing `:' command.
1010 * tests/depcomp2.test: Use `unset' on the CFLAG variable to ensure
1011 it's not in in the environment, rather than exporting it with an
1012 empty value. Do not pass CC=gcc to configure, as that's already
1013 done in ./defs since we have gcc in $required. Ensure verbose
1014 printing of captured stderr, and normalize its checking. Add a
1015 trailing `:' command.
1016 * tests/depcomp3.test: Quote literal dots and dollar characters in
1017 grep regexps. Always use `: >' rather than `touch' to create empty
1018 files. Explicitly declare phony targets as such in the created
1019 Makefile.am. Add a trailing `:' command.
1020 * tests/depcomp4.test: Quote literal dots and dollar characters in
1021 grep regexp. Explicitly declare phony targets as such in the
1022 created Makefile.am. Ensure verbose printing of captured makes'
1023 stoud/stderr. Add a trailing `:' command.
1024 * tests/depcomp5.test: Move setting of `errexit' shell flag earlier
1025 in the script (just after inclusion of ./defs). Quote literal dots
1026 and dollar characters in grep regexps. Explicitly declare phony
1027 targets as such in the created Makefile.am. Add a trailing `:'
1029 * tests/depcomp6.test: Consistently use m4 quoting in the generated
1030 configure.in. Cosmetic fixes to spacing. Make the "dummy" `if'
1031 statement required by OpenBSD's sh `set -e' more robust, and add
1032 explanatory comments to it.
1033 * tests/depcomp7.test: Likewise, and add a trailing `:' command.
1035 Separate failing part of test `all.test'.
1036 * tests/all.test: Keep only (x)failing part of the test. Working
1037 checks moved out to ...
1038 * tests/all2.test: ... this new test.
1039 * tests/Makefile.am (TESTS): Updated.
1041 Modernize, improve and extend tests `subobj*.test'.
1042 * tests/subobjname.test: Add trailing `:' command.
1043 * tests/subobj.test: Make grepping of `Makefile.in' stricter.
1044 Escape literal dots in grep regexps.
1045 * tests/subobj2.test: Add trailing `:' command. Do not use the
1046 unportable fgrep option `-e'.
1047 * tests/subobj3.test: Add trailing `:' command.
1048 (configure.in): Use proper m4 quoting, and avoid obsolescent
1050 * tests/subobj8.test: Likewise. Also, enable `errexit' shell
1051 flag, with related changes
1052 * tests/subobj4.test: Likewise. Also, make grepping of
1053 `Makefile.in' stricter.
1054 * tests/subobj5.test: Add trailing `:' command. Move setting of
1055 `errexit' shell flag earlier in the script (just after inclusion
1057 (configure.in): Use the stub created by `./defs', rather than
1058 writing it from scratch, and avoid obsolescent constructs.
1059 * tests/subobj6.test: Add trailing `:' command. Move setting of
1060 `errexit' shell flag earlier in the script (just after inclusion
1061 of ./defs). Do not create useless dummy ac-init file `f'.
1062 * tests/subobj7.test: Do not create useless dummy ac-init file
1064 (configure.in): Use the stub created by `./defs', rather than
1065 writing it from scratch, and avoid obsolescent constructs.
1066 * tests/subobj9.test: Move setting of `errexit' shell flag earlier
1067 in the script (just after inclusion of ./defs). Fail the test if
1068 `make distcheck' fails. Ensure verbose printing of captured make
1069 stdout. Avoid useless fork by doing simple grep instead of using
1070 test -n "`COMMAND | grep ...`".
1071 (configure.in): Normalize the call to AC_INIT w.r.t. other tests.
1072 (Makefile.am): Explicitly mark target "print" as phony.
1073 * tests/subobj10.test: Removed duplicated call to `set -e'. Add
1074 trailing `:' command.
1075 (configure.in): Normalize the call to AC_INIT w.r.t. other tests.
1077 Remove a couple of obsoleted tests.
1078 * tests/fpinstall.test: Removed.
1079 * tests/fpinst2.test: Likewise.
1080 * tests/Makefile.am (TESTS): Updated.
1082 Bootstrap: updated HACKING entry.
1083 * HACKING ("Working with git"): Explain how to override the
1084 autoconf and autom4te programs used by the bootstrap process.
1087 * bootstrap: Do not remove `lib/Automake/Config.pm' anymore,
1088 since we don't generate it. Correctly quote arguments of
1089 `eval' builtin. Fixed a botched error message. Removed an
1092 Bootstrap: don't search perl in $PATH.
1093 * bootstrap: Do not explicitly search perl in $PATH anymore.
1094 ($PATH_SEPARATOR): Removed, it's no more needed.
1096 Bootstrap: let the user choose which autoconf to use.
1097 * bootstrap ($AUTOCONF): New variable, from the environment.
1098 ($AUTOM4TE): Likewise, for clarity.
1099 Use "$AUTOCONF" instead of calling "autoconf" directly.
1101 Minor improvements to tests ar*.test.
1102 * tests/ar.test: Add trailing `:' command.
1103 * tests/ar2.test: Likewise, and make grepping of generated
1104 Makefile.in stricter.
1106 2010-08-08 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1108 Fix maintainer-check failure.
1109 * tests/cond5.test: Quote sleep argument, this isn't about
1110 time stamp differences.
1112 Sync auxiliary files from upstream.
1113 * lib/config.guess, lib/config.sub, lib/texinfo.tex:
1116 2010-08-06 Stefano Lattarini <stefano.lattarini@gmail.com>
1118 Work around a nasty bug (segfault) of Solaris make.
1119 * lib/am/check.am (recheck, recheck-html): Trim trailing spaces
1120 from $list, to avoid triggering a nasty bug (potential segfault)
1123 2010-08-06 Peter Rosin <peda@lysator.liu.se>
1125 Make cond5.test more robust on MSYS.
1126 * tests/cond5.test: Add delay before the first kill attempt to
1127 cater for problems with MSYS bash.
1129 2010-07-31 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1131 Add example git work flow; discuss merge --log in HACKING.
1133 Suggestion by Stefano Lattarini.
1135 Add more hints for debugging make rules.
1136 * doc/automake.texi (Debugging Make Rules): Show command to find
1137 out expanded values of variables; point to makefile debugger.
1139 Prompted by suggestion from Ludovic Courtès and Andy Wingo.
1141 2010-07-27 Patrick Welche <prlw1@cam.ac.uk> (tiny change)
1143 Fix typo in the manual.
1144 * doc/automake.texi (Scripts): Fix typo.
1146 2010-07-27 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1148 Document current policy for development with git.
1149 * HACKING (Working with git): Overhaul.
1150 Prompted by suggestion from Stefano Lattarini.
1152 Fix AM_COND_IF for gone-invalid condition shell expression.
1153 * m4/cond-if.m4 (AM_COND_IF): test contents of $COND_TRUE
1154 variable, rather than re-evaluating the shell expression for
1156 * tests/cond40.test: Extend test.
1159 Avoid syntax error if IF-TRUE part of AM_COND_IF expands empty.
1160 * m4/cond-if.m4 (AM_COND_IF): Ensure IF-TRUE part is never empty
1161 to avoid shell syntax error if the m4 expansion is empty.
1162 * tests/cond40.test: Enhance test.
1164 Coverage: bogus option to AM_INIT_AUTOMAKE.
1165 * tests/init2.test: New test.
1166 * tests/Makefile.am: Update.
1168 2010-07-21 Stefano Lattarini <stefano.lattarini@gmail.com>
1170 Modernize and improve test scripts `subdir*.test'.
1171 * tests/subdir.test: Enable `errexit' shell flag, and related
1172 changes. Use the `configure.in' stub created by `./defs',
1173 rather than writing one from scratch.
1174 * tests/subdir2.test: Likewise.
1175 * tests/subdir4.test: Likewise.
1176 * tests/subdir3.test: Enable `errexit' shell flag, and related
1177 changes. Do not create useless dummy source files.
1178 * tests/subdir5.test: Make grepping of Makefile.in (in topdir
1179 and in subdirs) stricter. Some minor changes to keep it more
1180 in sync with the related test `subdir8.test'.
1181 * tests/subdir8.test: Likewise (but with the related test being
1182 `subdir5.test' here).
1183 * tests/subdir6.test: Cosmetic change in spacing.
1184 * tests/subdir9.test: Define and use new variable `$distdir'. Add
1185 trailing `:' command.
1186 * tests/subdir10.test: Cosmetic consistency-related change.
1187 * tests/subdirbuiltsources.test: Cosmetic changes in spacings.
1188 (configure.in): Use stub created by `./defs', rather than writing
1189 it from scratch. Do not use obsoleted and/or deprecated forms of
1190 autoconf/automake macros.
1192 Modernize and improve test scripts `dist*.test'.
1193 * tests/distcleancheck.test: Do not add useless `-e' option to
1194 a $MAKE call. Extend test by grepping stderr of make.
1195 * tests/distcom2.test: Do not run the same test script on the
1196 Makefile.in twice, but save its output in an intermediate file
1197 instead. Make grepping of DIST_COMMON definition stricter.
1198 Display the content of more files, to ease debugging. Add a
1199 trailing `:' command. Improved heading comments w.r.t. sister
1201 * tests/distcom6.test: Likewise, and avoid to uselessly run
1203 * tests/distcom3.test: Ensure verbose printing of captured stdout
1204 and stderr. Make grepping of captured stderr stricter. Also,
1205 add trailing `:' command.
1206 * tests/distcom4.test: Declare the target `test' in the generated
1207 Makefile.am as `.PHONY'. Display content of more files, to ease
1208 debugging. Add trailing `:' command.
1209 * tests/distcom5.test: Likewise. Also, factor out common sed
1210 script in subroutine `extract_distcommon'.
1211 * tests/distcom7.test: Prefer cat + here-doc over echo to write
1212 test Makefile.am files. Add a trailing `:' command.
1213 * tests/distname.test: Prefer `gzip -d' over `gunzip'. Move the
1214 call to `set -e' earlier. Be stricter and more verbose in the
1215 checking of the generated tarball.
1216 (configure.in): Use the stub provided by ./defs, instead of
1217 writing it from scratch. Avoid obsoleted constructs. Remove
1218 useless call to `AM_PROG_CC_C_O'.
1219 * tests/distdir.test: Various minor improvements/normalizations.
1220 * tests/distlinks.test: Likewise.
1222 2010-07-18 Stefano Lattarini <stefano.lattarini@gmail.com>
1224 Improve and extend test cond5.test.
1225 * tests/cond5.test: Do not blindly sleep 60 seconds before polling
1226 the background automake process, but poll it every 10 seconds for
1227 at most 30 times (this makes the test both faster on good machines,
1228 and more resilient to spurious timeout-due failures when in low
1229 priority or on heavily-loaded systems).
1230 Check also that automake writes the expected error messages on the
1232 Enable `errexit' flag, and related changes.
1233 Rely on the `configure.in' stub created by `./defs', rather than
1234 writing one from scratch.
1236 2010-06-26 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1238 Update program --help output to match current GCS.
1239 * configure.ac: Set and substitute PACKAGE_URL if AC_PACKAGE_URL
1240 is not defined, for compatibility to Autoconf < 2.64.
1241 * Makefile.am (do_subst): Substitute PACKAGE_BUGREPORT and
1243 (sc_diff_automake_in_automake): Update number of diff lines for
1244 additional substitutions.
1245 * aclocal.in (usage): Use PACKAGE_BUGREPORT. Point to Automake
1246 home page and GNU general help page.
1247 * automake.in (usage): Likewise.
1248 * doc/automake.texi: New flag PACKAGE_BUGREPORT, to factor email
1250 (Introduction, Creating amhello, amhello Explained, Options):
1252 * lib/Automake/Makefile.am (do_subst): Substitute
1254 * lib/Automake/Config.in ($PACKAGE_BUGREPORT): New global.
1255 * lib/Automake/ChannelDefs.pm: Use it for footer of fatal
1258 Clean up @var handling in the manual.
1259 * doc/automake.texi: Throughout the manual, lower-case @var
1260 names, replace a few one-character names.
1262 2010-06-26 Stefano Lattarini <stefano.lattarini@gmail.com>
1264 Fix typo-related bug in test script silent5.test.
1265 * tests/silent5.test: Use $EGREP, not $GREP (which is not even
1268 Tests: remove useless repetitions of `foreign' automake option.
1269 * tests/multlib.test (configure.in): Remove useless use of
1270 `foreign' option in AM_INIT_AUTOMAKE (the `--foreign' option is
1271 already in $AUTOMAKE by default, so no point in repeating it).
1272 * tests/subobj10.test: Likewise.
1273 * tests/subobj9.test: Likewise.
1274 * tests/lex3.test (Makefile.am): Similarly, remove useless use
1275 of `foreign' option in AUTOMAKE_OPTIONS.
1276 * tests/lex5.test: Likewise.
1277 * tests/pr279.test: Likewise.
1278 * tests/pr279-2.test: Likewise.
1279 * tests/specflg3.test: Likewise.
1280 * tests/target-cflags.test: Likewise.
1282 Drop useless requirement "gzip" in lex5.test.
1283 * tests/lex5.test ($required): Do not list "gzip", as it's
1286 2010-06-24 Stefano Lattarini <stefano.lattarini@gmail.com>
1288 Fix bugs in test script silent5.test.
1289 * tests/silent5.test: Fixed a nasty bug (due to the use of grep
1290 instead of egrep) that could have led to false negatives.
1292 2010-06-21 Stefano Lattarini <stefano.lattarini@gmail.com>
1294 Add a test checking that distributed broken symlinks cause
1295 `make dist' to fail.
1296 * tests/distlinksbrk.test: New test.
1297 * tests/Makefile.am (TESTS): Updated.
1299 2010-06-21 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1301 Fix minor testsuite issues, update docs, for Yacc/Lex changes.
1302 * doc/automake.texi (Yacc and Lex): Mention AM_YFLAGS, YFLAGS
1303 and AM_LFLAGS, LFLAGS in the order in which they now appear in
1306 * tests/lflags.test, tests/lflags2.test, tests/yflags.test,
1307 tests/yflags2.test: Prefer `make -e' over `make VAR=VAL', to
1308 please maintainer-check. Ensure generated C files contain a
1309 declaration, to please compilers.
1311 2010-06-21 Stefano Lattarini <stefano.lattarini@gmail.com>
1313 Fix bugs in Automake Yacc/Lex support w.r.t. $(AM_FLAGS) and
1314 $(FLAGS) precedence.
1315 * automake.in: Fix registration of languages "Lex", "Lex (C++)",
1316 "Yacc" and "Yacc (C++)", so that $(LFLAGS) has precedence over
1317 $(AM_LFLAGS) and $(YFLAGS) has precedence over $(AM_YFLAGS).
1318 * tests/Makefile.am (XFAIL_TESTS): Updated accordingly.
1321 New tests, exposing bugs in Automake Yacc/Lex support w.r.t.
1322 $(AM_FLAGS) and $(FLAGS) precedence.
1323 * tests/lflags.test: New test, check that user $(LFLAGS) takes
1324 precedence over automake (AM_LFLAGS) and (foo_LFLAGS). Still
1326 * tests/lflags2.test: Likewise.
1327 * tests/yflags.test: New test, check that user $(YFLAGS) takes
1328 precedence over automake (AM_YFLAGS) and (foo_YFLAGS). Still
1330 * tests/yflags2.test: Likewise.
1331 * tests/Makefile.am (TESTS, XFAIL_TESTS): Extended accordingly.
1333 2010-06-20 Stefano Lattarini <stefano.lattarini@gmail.com>
1335 Modernize, improve and extend tests `suffix*.test'.
1336 * tests/suffix3.test: Enable `errexit' shell flag, and related
1338 * tests/suffix4.test: Likewise.
1339 * tests/suffix6.test: Likewise, and do not create a useless dummy
1341 * tests/suffix7.test: Likewise.
1342 * tests/suffix5.test: Enable `errexit' shell flag, and related
1343 changes. Make grepping of Makefile.in slightly stricter.
1344 * tests/suffix.test: Enable `errexit' shell flag, and related
1345 changes. Also, do not redirect grep output to /dev/null, as this
1346 might unmotivatedly hide useful information.
1347 * tests/suffix2.test: Move setting of `errexit' shell flag earlier
1348 in the script (just after inclusion of ./defs). Use a more
1349 idiomatic way to count text occurrences in Makefile.in with
1350 grep. Do not create useless dummy source files.
1351 * tests/suffix10.test: Ensure verbose printing of captured make
1352 stdout. Minor cosmetic changes.
1353 * tests/suffix8.test: Likewise. Also, drop useless call to the
1354 env(1) utility, and make grepping of make output stricter by using
1355 $FGREP rather than plain grep.
1356 * tests/suffix11.test: Likewise.
1357 * tests/suffix12.test: Likewise.
1358 * tests/suffix9.test: Prefer cat + here-doc over echo to append to
1359 the `configure.in' stub. Cosmetic changes.
1360 * tests/suffix13.test: Cosmetic spacing change.
1362 2010-06-13 Stefano Lattarini <stefano.lattarini@gmail.com>
1364 Add useful comment in test script ext.test.
1365 * tests/ext.test: Add a comment explaining why an apparently
1366 useless `if' statement is indeed required.
1368 Add useful comment in test script obsolete.test.
1369 * tests/obsolete.test: Add a comment explaining why we need
1370 an indirection in adding $AUTOUPDATE to $required.
1372 Normalize whitespaces in 'tests/Makefile.am'.
1373 * tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
1374 definition of this variable.
1376 2010-06-12 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1378 Remove a couple of unneeded conditionals from tests.
1379 * tests/pr243.test, tests/pr266.test, tests/strip.test: No need
1380 for the FOOTEST conditional.
1382 2010-06-12 Stefano Lattarini <stefano.lattarini@gmail.com>
1384 Modernize, improve and/or fix various test scripts.
1385 * tests/symlink3.test: Deleted, separated into two new, more
1387 * tests/forcemiss.test: ... this one ...
1388 * tests/forcemiss2.test: ... and this one.
1389 * tests/symlink2.test: Enable `errexit' shell flag, make test
1390 stricter, and skip it if symlink creation is not supported.
1391 * tests/postproc.test: Enable `errexit' shell flag, related
1392 changes, and a couple of unrelated cosmetic changes.
1393 * tests/recurs.test: Use the `configure.in' stub created by
1394 `./defs', rather than writing one from scratch. Make grepping
1395 of Automake stderr slightly stricter.
1396 * tests/substtarg.test: Likewise.
1397 * tests/strip.test: Likewise, and move the call to `set -e'
1398 earlier (just after the inclusion of `./defs'). Also, make sure
1399 that the script installed by `make install-script' is equal to
1401 * tests/substref.test: Use the `configure.in' stub created by
1402 `./defs', rather than writing one from scratch. Move the call
1403 to `set -e' earlier (just after the inclusion of `./defs').
1404 Avoid to explicitly export CC for configure (that's already done
1405 in ./defs). Avoid potential problems with unpredictable make
1406 output. Finally, make grepping of Makefile.in stricter.
1407 * tests/substre2.test: Ensure verbose printing of the captured
1408 make's output, and make its grepping slightly stricter.
1409 * tests/cygwin32.test: Enable `errexit' shell flag, and related
1410 changes. Also, do not create useless dummy source/data files.
1411 * tests/scripts.test: Likewise.
1412 * tests/recurs2.test: Likewise. Also, use the `configure.in'
1413 stub created by `./defs'.
1414 * tests/Makefile.am (TESTS): Updated.
1416 Modernize, improve and/or fix tests `pluseq*.test.
1417 * tests/pluseq5.test: Append to configure.in using cat with an
1418 here-doc, not using echo.
1419 * tests/pluseq10.test: Make sure that the captured output of
1420 `make' command is always displayed. Where possible, use $FGREP
1421 instead of grep (this change makes some checks slightly stricter).
1422 * tests/pluseq8.test: Enable `errexit' shell flag, with related
1424 * tests/pluseq.test: Likewise. Also, do not create useless dummy
1425 data files, and use better m4 quoting in generated configure.in.
1426 * tests/pluseq2.test: Likewise. Also, append to configure.in
1427 using cat with an here-doc, not using echo.
1428 * tests/pluseq3.test: Likewise.
1429 * tests/pluseq4.test: Likewise.
1430 * tests/pluseq6.test: Likewise.
1431 * tests/pluseq7.test: Do not create useless dummy source file.
1432 * tests/pluseq9.test: Slightly extended w.r.t. the grepping of
1433 Automake stderr. Some unrelated cosmetic changes.
1435 Testsuite: ensure verbose printing of captured stderr.
1436 * tests/acloca18.test: Print captured stderr before either failing
1437 or grepping it. Be sure to send captured stderr to stderr, not to
1439 * tests/ansi3b.test: Likewise.
1440 * tests/cond39.test: Likewise.
1441 * tests/configure.test: Likewise.
1442 * tests/missing3.test: Likewise.
1443 * tests/missing6.test: Likewise.
1444 * tests/output-order.test: Likewise.
1445 * tests/pr300-ltlib.test: Likewise.
1446 * tests/python6.test: Likewise.
1447 * tests/python7.test: Likewise.
1448 * tests/python8.test: Likewise.
1449 * tests/python9.test: Likewise.
1450 * tests/subobj.test: Likewise.
1451 * tests/vars3.test: Likewise.
1452 * tests/missing4.test: Likewise, and fix a call to grep not to use
1454 * tests/ansi3.test: Likewise, and rely on the `configure.in' stub
1455 created by `./defs', rather than writing one from scratch.
1457 Enable `errexit' shell flag in various tests.
1458 * tests/backsl.test: Enable the `errexit' shell flag, and
1460 * tests/backsl2.test: Likewise.
1461 * tests/block.test: Likewise.
1462 * tests/canon2.test: Likewise.
1463 * tests/canon4.test: Likewise.
1464 * tests/comment2.test: Likewise.
1465 * tests/condlib.test: Likewise.
1466 * tests/cond15.test: Likewise, and prefer $FGREP over grep.
1467 * tests/canon3.test: Likewise. Also, avoid to create an useless
1469 * tests/acoutpt2.test: Enable the `errexit' shell flag, and some
1470 related changes. Do some cosmetic improvements in the generated
1471 `configure.in' file.
1472 * tests/cond4.test: Likewise.
1473 * tests/cond14.test: Likewise.
1474 * tests/condinc.test: Likewise.
1475 * tests/cond7.test: Likewise. Also, remove useless setting of
1476 AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am.
1477 * tests/ansi.test: Enable the `errexit' shell flag, and related
1478 changes. Extended, esp. by running autoconf, ./configure and
1479 make, and by looking into the distdir.
1481 2010-06-12 Stefano Lattarini <stefano.lattarini@gmail.com>
1482 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1484 Extend tests/README w.r.t. trailing `:' in test scripts.
1485 * tests/README (section "Writing test cases" subsection "Do"):
1486 Explain why apparently redundant trailing `:' and `Exit 0' in
1487 test scripts can indeed be useful.
1489 2010-06-11 Stefano Lattarini <stefano.lattarini@gmail.com>
1491 Improve determination of PATH separator in bootstrap script.
1492 * bootstrap: Determine what the PATH separator is the same way
1495 Minor improvements in bootstrap script.
1496 * bootstrap: Consistently use two-spaces indentation. Cosmetic
1497 improvement to comments.
1498 ($me): New variable, containing program basename.
1499 Prepend it to all error messages.
1501 Testsuite now works with BSD make in parallel mode.
1502 * tests/defs.in: Unset variables __MKLVL__ and MAKE_JOBS_FIFO,
1503 which are exported by BSD make when run in parallel mode, and
1504 which can confuse make processes spawned by our testsuite.
1505 This change fixes a lot of spurious failure when the testsuite
1506 is run with BSD make in parallel mode.
1508 2010-06-09 Stefano Lattarini <stefano.lattarini@gmail.com>
1510 Modernize, improve and/or fix various test scripts.
1511 * tests/sanity.test: Rely on the `configure.in' stub created by
1512 `./defs', rather than writing one from scratch.
1513 * tests/depend2.test: Likewise. Also, call `set -e' just after
1514 the inclusion of `./defs', instead that later in the script.
1515 * tests/canon5.test: Avoid a useless `|| Exit 1' after a call to
1516 $AUTOMAKE, and improve the positioning of an $ACLOCAL call.
1517 * tests/exeext4.test: Use $FGREP instead of grep, where possible.
1518 Make auxiliary rules in the generated Makefile more silent.
1519 These changes make some checks slightly stricter.
1520 * tests/ext2.test: Call `Exit 1' if inclusion of `./defs' fails.
1521 * tests/gettext2.test: Place final `:' at the end of the script,
1522 rather than in the middle.
1523 * tests/exeext.test: Call `set -e' just after the inclusion of
1524 `./defs', instead that later in the script.
1525 * tests/extra5.test: Likewise.
1526 * tests/confdeps.test: Likewise. Also, prefer `mv -f' over
1527 plain `mv', just to be sure.
1528 * tests/depcomp.test: Enable `errexit' shell flag, with related
1529 changes. Also, modernize the generated configure.in.
1530 * tests/cond9.test: Likewise. Also, rely on the `configure.in'
1531 stub created by `./defs', rather than writing one from scratch.
1532 * tests/cond10.test: Likewise.
1533 * tests/depcomp2.test: Likewise.
1534 * tests/depend3.test: Likewise.
1535 * tests/distcom7.test: Likewise.
1536 * tests/fortdep.test: Likewise. Also, remove definition of
1537 AUTOMAKE_OPTIONS to `foreign' in the generated Makefile.am,
1538 since that flag is already provided by $AUTOMAKE.
1539 * tests/mdate.test: Made stricter, by checking that Automake
1540 actually failed, and by making a stricter grep on the error
1541 message. Also, set shell `errexit flag'.
1542 * tests/python2.test: Improved verbose messages.
1544 Make test `ammissing.test' stricter.
1545 * tests/ammissing.test: Fail if $ACLOCAL succeeds unexpectedly.
1546 Enable `errexit' shell flag.
1548 2010-06-08 Stefano Lattarini <stefano.lattarini@gmail.com>
1550 Enable `errexit' shell flag in some test scripts.
1551 * tests/subcond.test: Enabled `errexit' shell flag, and related
1553 * tests/subst.test: Likewise.
1554 * tests/vars.test: Likewise.
1555 * tests/version4.test: Likewise.
1556 * tests/vpath.test: Likewise.
1557 * tests/vtexi2.test: Likewise.
1558 * tests/werror.test: Likewise.
1559 * tests/whoami.test: Likewise.
1560 * tests/tags.test: Likewise, and avoid to crate an useless dummy
1562 * tests/acsilent.test: Likewise, and don't use an easily-avoided
1563 command substitution.
1564 * tests/unused.test: Likewise, and don't use an easily-avoided
1565 command substitution.
1566 * tests/version.test: Likewise, and avoid deprecated constructs
1567 in the generated `configure.in'.
1568 * tests/version2.test: Likewise, and avoid deprecated constructs
1569 in the generated `configure.in'.
1571 2010-06-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1573 Prefer AUTOMAKE_fails over `$AUTOMAKE | grep' in tests.
1574 * tests/ldadd.test: Enable errexit. Use AUTOMAKE_fails so
1575 the verbose log contains all output.
1576 * tests/mdate.test: Likewise.
1577 Prompted by Stefano Lattarini's change to discover.test.
1579 2010-06-06 Stefano Lattarini <stefano.lattarini@gmail.com>
1581 Improve tests link*.test (enable `errexit' shell flag).
1582 * tests/link_c_cxx.test: Enable `errexit shell flag, and related
1583 changes. Also, do not create useless source files.
1584 * tests/link_dist.test: Likewise.
1585 * tests/link_f90_only.test: Likewise.
1586 * tests/link_f_only.test: Likewise.
1587 * tests/link_fc.test: Likewise.
1588 * tests/link_fccxx.test: Likewise.
1589 * tests/link_fcxx.test: Likewise.
1591 2010-06-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1593 Improve ext.test semantics, avoid OpenBSD sh errexit issue.
1594 * tests/ext.test: Inside shell compound command, use
1595 `if $cmd; then Exit 1; fi' rather than `$cmd && Exit 1', to
1596 fix failure with OpenBSD sh introduced with last patch.
1597 Actually ensure that a rule for .EXT.o is created for each
1598 known extension EXT.
1600 2010-06-06 Stefano Lattarini <stefano.lattarini@gmail.com>
1602 Enable `errexit' shell flag in some test scripts.
1603 * tests/dash.test: Enable `errexit' shell flag, and related
1605 * tests/defun.test: Likewise.
1606 * tests/defun2.test: Likewise.
1607 * tests/dejagnu.test: Likewise.
1608 * tests/double.test: Likewise.
1609 * tests/distcom2.test: Likewise.
1610 * tests/empty2.test: Likewise.
1611 * tests/empty3.test: Likewise.
1612 * tests/empty4.test: Likewise.
1613 * tests/exdir.test: Likewise.
1614 * tests/ext.test: Likewise.
1615 * tests/extra.test: Likewise.
1616 * tests/extra2.test: Likewise.
1617 * tests/extra3.test: Likewise.
1618 * tests/extra4.test: Likewise.
1619 * tests/flibs.test: Likewise.
1620 * tests/fnoc.test: Likewise.
1621 * tests/fo.test: Likewise.
1622 * tests/instexec.test: Likewise.
1623 * tests/ltdeps.test: Likewise.
1624 * tests/nodep.test: Likewise.
1625 * tests/nodepcomp.test: Likewise.
1626 * tests/f90only.test: Likewise, and remove botched/obsoleted
1627 comments and unnecessary commands.
1628 * tests/fonly.test: Likewise, and remove botched/obsoleted
1629 comments and unnecessary commands.
1630 * tests/discover.test: Likewise, and made stricter.
1632 Enable `errexit' shell flag in all tests cxx*.test.
1633 * tests/cxx.test: Enabled `errexit' shell flag, and related
1635 * tests/cxxansi.test: Likewise.
1636 * tests/cxxcpp.test: Likewise.
1637 * tests/cxxlibobj.test: Likewise.
1638 * tests/cxxlink.test: Likewise.
1639 * tests/cxxo.test: Likewise.
1641 Enable `errexit' shell flag in various tests.
1642 * tests/acoutnoq.test: Enabled `errexit' shell flag, and related
1644 * tests/acoutpt.test: Likewise.
1645 * tests/acoutqnl.test: Likewise.
1646 * tests/amassign.test: Likewise.
1647 * tests/ansi2.test: Likewise.
1648 * tests/ansi4.test: Likewise.
1649 * tests/badprog.test: Likewise.
1650 * tests/checkall.test: Likewise.
1651 * tests/clean.test: Likewise.
1652 * tests/colneq2.test: Likewise.
1653 * tests/colon.test: Likewise.
1654 * tests/colon5.test: Likewise.
1655 * tests/colon6.test: Likewise.
1656 * tests/comment.test: Likewise.
1657 * tests/compile_f90_c_cxx.test: Likewise.
1658 * tests/compile_f_c_cxx.test: Likewise.
1659 * tests/cond3.test: Likewise.
1660 * tests/cond6.test: Likewise.
1661 * tests/cond13.test: Likewise.
1662 * tests/conf2.test: Likewise.
1663 * tests/confvar.test: Likewise.
1664 * tests/confvar2.test: Likewise.
1665 * tests/cond8.test: Likewise, plus a cosmetic change.
1666 * tests/confh4.test: Likewise. Also, add in the heading comments
1667 an excerpt from the original bug report which motivated the
1668 creation of this test, to make its purpose clearer.
1670 2010-06-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1672 Rewrite manual to be gender-neutral.
1673 * doc/automake.texi (GNU Build System)
1674 (Standard Directory Variables, General Operation, CVS)
1675 (Hard-Coded Install Paths, Dependencies As Side Effects):
1676 Rewrite text to not contain gender-specific pronouns when
1677 speaking about developers or users, either by avoiding pronouns
1678 or by addressing them as `you' instead.
1680 Report by Christina Gratorp.
1684 2010-06-06 Stefano Lattarini <stefano.lattarini@gmail.com>
1686 Make tests on user extensibility of silent-rules mode stricter.
1687 * tests/silent6.test: Made stricter w.r.t. the grepping of the
1688 output produced by `make'.
1689 * tests/silent7.test: Likewise.
1691 Tests on silent-mode for C/Libtool made stricter.
1692 * tests/silent.test: Made stricter w.r.t. the grepping of the
1693 output produced by `make'.
1694 * tests/silent2.test: Likewise.
1695 * tests/silent4.test: Likewise.
1696 * tests/silent9.test: Likewise.
1697 * tests/silent3.test: Likewise, and add a final `make distclean'
1698 command to keep it better in sync with tests/silent{4,9}.test.
1700 Improved test silent5.test.
1701 * tests/silent5.test: Remove by hand all generated C files after
1702 non-verbose builds, to ensure the following builds are clean.
1703 Try to clean and rebuild with the same verbosity and without
1704 removing generated sources in between, to check that this does
1705 not trigger a different set of rules. Make grepping of make's
1706 output stricter. Improved/added some comments.
1708 New tests for Automake silent-mode with Fortran.
1709 * tests/silentf77.test: New test.
1710 * tests/silentf90.test: Likewise.
1711 * tests/Makefile.am (TESTS): Updated accordingly.
1713 New test `silentcxx.test' (Automake silent-mode with C++).
1714 * tests/silentcxx.test: New test.
1715 * tests/Makefile.am (TESTS): Updated accordingly.
1717 New test `silentyacc.test' (Automake silent-mode with Yacc).
1718 * tests/silentyacc.test: New test.
1719 * tests/Makefile.am (TESTS): Updated accordingly.
1721 New test `silentlex.test' (Automake silent-mode with Lex).
1722 * tests/silentlex.test: New test.
1723 * tests/Makefile.am (TESTS): Updated accordingly.
1725 Relax tests on silent-rules to cater to overly verbose makes.
1726 * tests/silent.test: When testing silent builds, don't fail if
1727 make's output simply contains the `mv' substring, but only if
1728 it contains the `mv ' substring (note the trailing space).
1729 * tests/silent2.test: Likewise.
1730 * tests/silent3.test: Likewise.
1731 * tests/silent4.test: Likewise.
1732 * tests/silent5.test: Likewise.
1733 * tests/silent9.test: Likewise.
1735 2010-01-24 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1737 Fix silent-rules output for disabled dependency tracking.
1738 * lib/am/depend2.am [!%FASTDEP%]: Rework silent-rules variable
1739 expansion code to also work in the case where %AMDEP% expands
1740 to FALSE at config.status time, using new substitution string
1742 * automake.in (verbose_nodep_flag): New function, appending
1743 `@am__nodep@' to the verbose-variable name.
1744 (handle_languages): If dependencies are not disabled, use it to
1745 set %VERBOSE-NODEP%.
1746 * m4/depend.m4: Substitute am__nodep as '_no', so the second
1747 verbose-variable will always expand to an empty string, if
1748 dependencies are enabled.
1749 * tests/silent5.test: Also test --disable-dependency-tracking;
1750 also test per-target flags for non-C language files.
1751 * tests/silent9.test: New test, like silent4.test but disable
1752 dependency tracking.
1753 * tests/Makefile.am: Adjust.
1754 * NEWS, THANKS: Update.
1755 Report by Dmitry V. Levin <ldv@altlinux.org>.
1757 2010-05-23 Stefano Lattarini <stefano.lattarini@gmail.com>
1759 Extend test on `nostdinc' automake option.
1760 * tests/nostdinc.test: Enable `errexit' shell flag. Related and
1761 unrelated minor changes. Make the grepping of the generated
1762 Makefile.in slightly stricter. Generate and run configure, so that
1763 the generated Makefile can be grepped too.
1765 2010-05-23 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1767 Make gnupload portable to EBCDIC hosts.
1768 * lib/gnupload: Use literal newline as argument for 'tr' rather
1769 than \015, for EBCDIC hosts. Also, avoid unportable nested
1770 double-quotes and backquotes.
1772 Report from Eric Blake and Steve Goetze via gnulib.
1774 2010-05-23 Stefano Lattarini <stefano.lattarini@gmail.com>
1776 Fix Autoconf version required by Automake's configure.
1777 Automake configure script used to tell that automake required
1778 autoconf 2.60 or later, but then it checked for autoconf >= 2.62,
1779 and if that was not found, it gave an error saying that Automake
1780 required configure 2.61a-341 or later. This change should
1781 eliminate such inconsistencies.
1782 * configure.ac ($required_autoconf_version): New variable.
1785 2010-05-23 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1787 Fix unportable sed script in maintainer-check test.
1788 * Makefile.am (sc_tests_Exit_not_exit): Rewrite sed script to
1789 not contain semicolon after 'b' or brace commands, for NetBSD.
1791 Wildcards are not portable to NetBSD make.
1792 * doc/automake.texi (Wildcards): Document portability issue.
1793 * tests/extra10.test, tests/extra11.test, tests/extra12.test:
1796 2010-05-23 Stefano Lattarini <stefano.lattarini@gmail.com>
1798 Make test for configure.in vs. configure.ac stricter.
1799 * tests/configure.test: Use a configure.in file that provokes
1800 an automake error, to ensure configure.ac is preferred.
1802 Avoid possible false negatives in dejagnu7.test.
1803 * tests/dejagnu7.test: Enable shell `errexit' flag. Also, avoid
1804 unportable use of fgrep option `-e'.
1806 Fix conflnk3.test to work with Solaris/Heirloom Sh.
1807 * tests/conflnk3.test: Use `test -r FILE' and `test ! -r FILE'
1808 instead of respectively `test -e FILE' and `test ! -e FILE',
1809 since Solaris Sh doesn't grok the latter. Do not SKIP the test
1810 if the shell doesn't support `test -e'.
1812 2010-04-25 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1815 * doc/automake.texi (Simple Tests using parallel-tests): Add
1816 missing closing parenthesis.
1818 Fix leftover call to removed function macros_dump.
1819 * automake.in (read_main_am_file): Call variables_dump, not
1820 macros_dump. Print actual error before list of variables.
1822 2010-04-25 Stefano Lattarini <stefano.lattarini@gmail.com>
1824 Minor improvements in comments of test `silent3.test'.
1825 * tests/silent3.test: Tell to keep it in sync with `silent9.test'
1828 2010-04-25 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1830 testsuite: ensure verbose printing of captured output.
1831 * tests/acloca14.test, tests/acloca18.test, tests/aclocal.test,
1832 tests/fort2.test, tests/help.test, tests/missing3.test,
1833 tests/missing6.test: Print captured stdout or stderr before
1836 2010-04-20 Stefano Lattarini <stefano.lattarini@gmail.com>
1838 Make test badopt.test stricter (by enabling `set -e').
1839 * tests/badopt.test: Add call to `set -e'. Due to this change,
1840 an unexpected failure in the call to `$ACLOCAL' (whose outcome
1841 was previously unchecked) would cause the whole test to fail.
1842 Also, bumped the copyright years.
1844 Make test for configure.in vs. configure.ac stricter.
1845 * tests/configure.test: Use a configure.in file that provokes
1846 an automake error, to ensure configure.ac is preferred.
1848 Use `set -e' in confsub.test (avoids possible false negatives).
1849 * tests/confsub.test: Enable shell `errexit' flag, and related
1850 changes (this helps avoiding some possible minor false negatives).
1851 Also, bumped copyright years.
1853 2010-04-20 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1855 Fix -Werror handling for presence of configure.in and configure.ac.
1856 * lib/Automake/Variable.pm (Automake::Variable): Do not initialize
1857 $configure_ac at the global level, before command-line arguments
1859 (require_variables): Initialize it here.
1860 * tests/configure.test: New test.
1861 * tests/Makefile.am: Update.
1862 Report by Stefano Lattarini.
1864 2010-04-20 Stefano Lattarini <stefano.lattarini@gmail.com>
1866 Avoid possible false negatives in confh5.test.
1867 * tests/confh5.test: Enable shell `errexit' flag, and bumped
1868 copyright years. Due to this change, any unexpected failure
1869 in calls to $ACLOCAL, $AUTOMAKE, $AUTOCONF or $AUTOHEADER, or
1870 a failure in grepping expected text in output files should now
1871 cause the whole test to fail.
1873 2010-04-17 Stefano Lattarini <stefano.lattarini@gmail.com>
1875 Fixed typo in POD documentation of Automake::Channels.
1876 * lib/Automake/Channels.pm: Fixed typo in POD documentation:
1877 @<...> was used instead of C<...>.
1879 2010-04-14 Stefano Lattarini <stefano.lattarini@gmail.com>
1881 Refactor tests on Automake TESTS color output.
1882 * tests/color.test: Tests using the expect program moved out to...
1883 * tests/color2.test: ... this new file.
1884 * tests/Makefile.am (TESTS): Extended accordingly.
1886 2010-04-12 Stefano Lattarini <stefano.lattarini@gmail.com>
1888 Fix typos in comments in test confh5.test
1889 * tests/confh5.test: Fix a couple of typos in comments.
1891 Avoid possible false negatives in canon-name.test.
1892 * tests/canon-name.test: Enable shell `errexit' flag. Improve
1895 2010-04-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1897 Fix per-Makefile.am setting of -Werror.
1898 Before this patch, 'AUTOMAKE_OPTIONS = -Werror' in one
1899 Makefile.am would carry over to other Makefile.am files
1900 treated afterwards by the same thread, causing inconsistent
1901 and unstable exit status values.
1902 * lib/Automake/Channels.pm (dup_channel_setup)
1903 (drop_channel_setup): Save and restore the setting of
1904 $warnings_are_errors.
1905 * tests/werror3.test: New test.
1906 * tests/Makefile.am: Adjust.
1909 2010-04-11 Stefano Lattarini <stefano.lattarini@gmail.com>
1911 Bugfix in confh5.test w.r.t. Solaris/Heirloom Sh.
1912 * tests/confh5.test: In the generated Makefile.am: do not use
1913 `test ! -e FILE' to check for the non-existence of a file, since
1914 that is not supported by Solaris/Heirloom Sh.
1916 Make test `aclocal3.test' stricter.
1917 * tests/aclocal3.test: Add call to `set -e'. Fail if $ACLOCAL
1918 succeds unexpectedly.
1920 Add tests checking that symlinks are resolved by `make dist'.
1921 * tests/distlinks.test: New test.
1922 * tests/Makefile.am (TESTS): Updated accordingly.
1923 Suggested by observations from Ralf Wildenhues.
1925 2010-04-11 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1927 Use -9 for maximum xz compression with dist-xz.
1928 * lib/am/distdir.am (dist-xz, dist, dist-all): Pass -9 to xz.
1929 * NEWS, THANKS: Update.
1930 Report by Pavel Sanda.
1932 2010-03-30 Stefano Lattarini <stefano.lattarini@gmail.com>
1934 Avoid an unportable use of `$status' shell variable.
1935 * Makefile.am (path-check): Don't use the `$status' shell variable
1936 in the target's rules, as it's special in Zsh (equivalent to `$?',
1939 Avoid another use of `chmod -R'.
1940 * Makefile.am (path-check): To be safe, do not use `chmod -R' on
1941 $(distdir) before removing it (as Solaris `chmod -R' touches
1942 symlink targets). Instead, use the cleanup strategy used in
1945 2010-03-28 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1947 Remove uses of @acronym and @sc.
1948 * doc/automake.texi (Public Macros, Limitations on File Names):
1949 Remove all usage of @acronym and @sc in the manual.
1950 Suggested by Karl Berry.
1952 2010-03-13 Karl Berry <karl@freefriends.org>
1954 GNU hello uses fdl.texi, not gpl.texi.
1955 * doc/automake.texi (Texinfo): Adjust example to upstream
1958 2010-03-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1960 Formatting cleanups in macro comments.
1961 * automake.in, lib/Automake/Channels.pm,
1962 lib/Automake/FileUtils.pm, lib/Automake/Options.pm,
1963 lib/Automake/Variable.pm, lib/Automake/XFile.pm,
1964 m4/options.m4, m4/substnot.m4: Fix macro comment format.
1966 2010-03-04 Stefano Lattarini <stefano.lattarini@gmail.com>
1967 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
1969 Avoid generation of `tests/defs-p' file.
1970 * tests/defs.in: In the generated `configure.in' snippet: call
1971 `AM_INIT_AUTOMAKE' with the `parallel-tests' option if the shell
1972 variable `parallel_tests' is set to `yes'.
1973 * tests/Makefile.am (defs-p): Target removed.
1974 (check_SCRIPTS): Removed `defs-p'.
1975 (clean-local-check): Do not unlink `defs-p' anymore.
1976 ($(parallel_tests)): Transformation rules for the test scripts
1978 * tests/gen-parallel-tests: Selection rules for the test
1980 * tests/parallel-tests.test: Set `$parallel_tests' to `yes'
1981 then include `./defs' (rather than simply including `./defs-p').
1982 * tests/parallel-tests2.test: Likewise.
1983 * tests/parallel-tests3.test: Likewise.
1984 * tests/parallel-tests4.test: Likewise.
1985 * tests/parallel-tests5.test: Likewise.
1986 * tests/parallel-tests6.test: Likewise.
1987 * tests/parallel-tests7.test: Likewise.
1988 * tests/parallel-tests8.test: Likewise.
1989 * tests/parallel-tests9.test: Likewise.
1990 * tests/parallel-tests10.test: Likewise.
1991 * tests/README (Section "Writing Test Cases" subsection "Do"):
1992 Adjusted the parts referring to tests checking `parallel-tests'
1993 behaviour. Some other minor related improvements.
1994 * tests/.gitignore (defs-p): Removed.
1996 2010-03-04 Stefano Lattarini <stefano.lattarini@gmail.com>
1998 Remove redundant unset of variable TESTS from some test scripts.
1999 * tests/color.test: Do not unset the `TESTS' variable, as it's
2000 already unset in the `defs' file.
2001 * tests/check5.test: Likewise.
2002 * tests/check8.test: Likewise.
2003 * tests/check9.test: Likewise.
2004 * tests/check10.test: Likewise.
2005 * tests/check11.test: Likewise.
2006 * tests/parallel-tests.test: Likewise.
2007 * tests/parallel-tests3.test: Likewise.
2008 * tests/parallel-tests4.test: Likewise.
2009 * tests/parallel-tests5.test: Likewise.
2010 * tests/parallel-tests6.test: Likewise.
2011 * tests/parallel-tests7.test: Likewise.
2013 2010-02-22 Karl Berry <karl@gnu.org>
2015 Improve help message of mdate-sh.
2016 * mdate-sh: mention actual output format in help message.
2018 2010-02-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
2020 Deprecate dist-lzma in favor of dist-xz.
2021 * doc/automake.texi (The Types of Distributions, Options):
2022 Adjust text to reflect renaming of lzma to xz.
2024 Missing deprecation noted by Antonio Diaz Diaz.
2026 2010-02-20 Stefano Lattarini <stefano.lattarini@gmail.com>
2028 Add tests about support of wildcards in EXTRA_DIST.
2029 * tests/extra10.test: New test, check basic support of wildcards
2031 * tests/extra11.test: New test, check more complex usage of
2032 wildcards in EXTRA_DIST.
2033 * tests/extra12.test: New test, check usage of wildcards in
2034 EXTRA_DIST when $builddir != $srcdir.
2035 * tests/Makefile.am (TESTS): Updated accordingly.
2036 Necessity of these new tests suggested by Braden McDaniel
2037 and Ralf Wildenhues.
2039 2010-02-08 Simon Josefsson <simon@josefsson.org>
2041 Fix copyright statement in gnupload script.
2042 * lib/gnupload: Fix copyright statement.
2044 2010-02-06 Dmitry V. Levin <ldv@altlinux.org> (tiny change)
2045 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
2047 Fix exit status of signal handlers in shell scripts.
2048 The value of `$?' on entrance to signal handlers in shell scripts
2049 cannot be relied upon, so set the exit code explicitly to
2051 * lib/am/check.am (am__check_pre): Use `exit 143' in signal handler.
2052 * lib/elisp-comp: Likewise.
2053 * lib/install-sh: Likewise.
2054 * lib/ylwrap: Likewise. Also, fix script to trap signal 13, not 3.
2055 * NEWS, THANKS: Update.
2056 Bug report, analysis, and initial patch by Dmitry V. Levin.
2058 2010-02-06 Karl Berry <karl@gnu.org>
2060 Improve gnupload usage text.
2061 * gnupload (usage): Shorten to make more likely to fit on a tty
2062 line. Mention CMD in the synopsis. With ..., plural is implied.
2064 2010-01-28 Christos Kontas <xakon@yahoo.com> (tiny change)
2066 Fix some typos in the manual
2067 * doc/automake.texi (Nested Packages, Rebuilding): Fix typos.
2069 2010-01-17 Stefano Lattarini <stefano.lattarini@gmail.com>
2071 Slighty improve tests acoutbs.test and acoutbs2.test.
2072 * tests/acoutbs2.test: Enable `errexit' shell flag. Check that
2073 autoconf and configure work, that the file `zot' is created by
2074 configure, and that no file containing a backslash in its name is
2076 * tests/acoutbs.test: Likewise, plus updated copyright years.
2078 Fix test acoutbs2.test.
2079 * tests/acoutbs2: In the generated configure.in: add proper calls
2080 to AC_INIT and AM_INIT_AUTOMAKE, and remove explicit definition of
2081 PACKAGE and VERSION. Add a call to aclocal before calling automake.
2082 Updated copyright years.
2083 * tests/Makefile.am (XFAIL_TESTS): Removed acoutbs2.test.
2085 Add forgotten test scripts to $(TESTS).
2086 * tests/Makefile.am (TESTS): Added test scripts present on the
2087 filesystem, which were erroneously left out from $(TESTS):
2088 acoutbs2.test, badopt.test, extra2.test.
2089 (XFAIL_TESTS): Added acoutbs2.test.
2091 2010-01-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
2093 Sync auxiliary files from upstream.
2094 * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub:
2097 Bump copyright years.
2098 * aclocal.in (write_aclocal, version): Bump copyright years.
2099 * automake.in (gen_copyright, version): Likewise.
2100 * doc/automake.texi: Likewise.
2103 * ChangeLog.09: New file, rotated from ...
2104 * ChangeLog: ... here.
2105 * Makefile.am (EXTRA_DIST): Distribute ChangeLog.09.
2109 Copyright (C) 2010 Free Software Foundation, Inc.
2111 Copying and distribution of this file, with or without modification, are
2112 permitted provided the copyright notice and this notice are preserved.