From: Stefano Lattarini Date: Tue, 31 May 2011 16:07:56 +0000 (+0200) Subject: Merge branch 'master' into testsuite-work X-Git-Tag: ng-0.5a~89^2~217 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a73aff7c63518d30b87ed36596c6f25afc01aaa;p=thirdparty%2Fautomake.git Merge branch 'master' into testsuite-work * master: automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too tests/README: fix example about `make -e' usage --- 0a73aff7c63518d30b87ed36596c6f25afc01aaa diff --cc ChangeLog index 08ae5da89,cb8adbcc3..281afa214 --- a/ChangeLog +++ b/ChangeLog @@@ -1,26 -1,53 +1,76 @@@ + 2011-05-29 Stefano Lattarini + + automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE + Currently, the Automake's own configure script allow definition + of AUTOCONF and AUTOM4TE, expected to point respectively to an + autoconf and autom4te programs. But while these definitions are + honoured in the Automake's build systems and test suite, they + were *not* honoured in the generated `automake' and `aclocal' + scripts. This behaviour, apart from being wrong in that it does + not allow the user enough freedom in choosing his tools, also + caused inconsistencies in the test suite, brining to spurious + failures. + Problem reported by Graham Reitz on the automake list; see thread: + + * automake.in ($traces): Use `@am_AUTOCONF', not simply `autoconf'. + * aclocal.in ($traces): Use `@am_AUTOM4TE', not simply `autom4te'. + * Makefile.am (do_subst): Substitute also `@am_AUTOCONF' and + `@am_AUTOM4TE'. + * NEWS: Update. + * THANKS: Update. + + 2011-05-29 Stefano Lattarini + + build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too + Our build system allows the user to override AUTOCONF and AUTOHEADER + at configure time, and honours these overrides in our testsuite. + But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE. + This change fixes that inconsistency. + * configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New + AC_SUBSTitutions. Update comments. + * tests/defs.in ($AUTOUPDATE): Default to `@am_AUTOUPDATE@' now. + ($AUTOM4TE): New variable, defaulting to `@am_AUTOM4TE@'. + ($AUTORECONF): New variable, defaulting to `@am_AUTORECONF@'. + * doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update. + + 2011-05-22 Ralf Wildenhues + Stefano Lattarini + + tests/README: fix example about `make -e' usage + * tests/README (Section "Writing test cases" subsection "Do"): When + some variable is never initialized in the Makefile, `-e' is not + necessary in order to override it. DESTDIR is such a variable: we + ensure that we do not ever initialize it. And as such, it is quite + portable to use: + $ make DESTDIR=/foo/bar install + and in fact, quite widely used. + So our example about when `make -e' is required, which references + the `DESTDIR' variable, is poorly chosen, if not downright wrong. + Rewrite it to use `prefix' as the overridden variable instead. + +2011-05-29 Stefano Lattarini + + tests: don't require gfortran if any fortran compiler is enough + * tests/silentf90.test ($required): Require `fortran', not + `gfortran'. + * tests/silentf77.test ($required): Require `fortran77', not + `gfortran'. + * tests/silent-many-generic.test ($required): Require `fortran' + and `fortran77' rather than `gfortran'. + +2011-05-27 Stefano Lattarini + + tests: improve `ccnoco*.test', better cross-compiling support + * tests/ccnoco3.test (Mycomp): Use the `$CC' chosen by `tests/defs' + instead of forcing `gcc' unconditionally. This ensures better + coverage in case of cross-compiling, when GCC can be named e.g., + `i586-mingw32msvc-gcc', instead of simply `gcc'. + * tests/ccnoco.test: Likewise. Remove redundant checks. Modernize + the created `configure.in'. Run tests both in-tree and in VPATH. + Export `CC' to the overridden value only once. + * tests/ccnoco2.test: Slightly stricter grepping of automake + stderr. Add trailing `:' command. + 2011-05-27 Stefano Lattarini testsuite: each test case depends on `defs-static' diff --cc configure index 723491cf1,c3024839d..499015d83 --- a/configure +++ b/configure @@@ -605,12 -605,11 +605,15 @@@ am__isr INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM + am_AUTOUPDATE am_AUTOHEADER + am_AUTORECONF + am_AUTOM4TE am_AUTOCONF +host_os +host_vendor +host_cpu +host build_os build_vendor build_cpu