From: Stefano Lattarini Date: Thu, 22 Dec 2011 18:20:46 +0000 (+0100) Subject: Merge branch 'pr9768-fix' into maint X-Git-Tag: v1.11.2b~18^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4c6598062ee2f7e78da86ea6332cfd3847ac221e;p=thirdparty%2Fautomake.git Merge branch 'pr9768-fix' into maint * pr9768-fix: include: avoid "deleted .am file" problem --- 4c6598062ee2f7e78da86ea6332cfd3847ac221e diff --cc ChangeLog index 10632c0f5,d630aeff0..007591dae --- a/ChangeLog +++ b/ChangeLog @@@ -1,18 -1,28 +1,43 @@@ + 2011-12-22 Stefano Lattarini + + include: avoid "deleted .am file" problem + * automake.in (handle_configure): When processing `configure.am', + also expand `HAVE-MAKEFILE-IN-DEPS' to a boolean telling whether + `MAKEFILE-IN-DEPS' is empty or not. + * lib/am/configure.am [?HAVE-MAKEFILE-IN-DEPS?] + (%MAKEFILE-IN-DEPS%): New target without dependencies, to + avoid the "deleted .am file" problem. Emit this only when + `?HAVE-MAKEFILE-IN-DEPS?' is true, to avoid generating an + "empty" dependency declaration. + * tests/deleted-am.test: Make grepping of error message stricter. + * tests/dist-missing-am.test: Likewise. + * tests/remake-deleted-am.test: New test. + * tests/remake-deleted-am-2.test: Likewise. + * tests/remake-deleted-am-subdir.test: Likewise. + * tests/remake-renamed-am.test: Likewise. + * tests/makefile-deps.test: Likewise. + * tests/Makefile.am (TESTS): Add the new tests. + * NEWS: Update. + Fixes automake bug#9768. + Report by Peter Johansson. + See also commit `Release-1-10-40-gd0ebf71', which fixed a similar + problem for .m4 files included by configure.ac. + +2011-12-22 Stefano Lattarini + + maint: better use of autoconf 2.68 features + * configure.ac: Now that Automake requires autoconf 2.68 for its + own bootstrapping and build system, we can assume that PACKAGE_URL + gets automatically AC_SUBT'd. + +2011-12-22 Stefano Lattarini + + cosmetics: use proper m4 quoting in configure.ac + * configure.ac (AC_CONFIG_SRCDIR): Use proper m4 quoting + for its arguments. + (AC_CONFIG_AUX_DIR): Likewise. + (AC_PROG_PATH): Likewise. + 2011-12-14 Stefano Lattarini tests: better handling of gettext and libtool requirements