They have been broken after our removal of the 'perllibdir' hack
in yesterday's commit v1.12.4-45-g4872dfe.
* configure.ac: Rather then redefining AUTOMAKE and ACLOCAL to
explicitly override the perllibdir, the acdir and the libdir, use
the ready-made t/wrap/{aclocal,automake}-$APIVERSION scripts.
* NEWS: Document the fix.
Signed-off-by: Stefano Lattarini <stefano.lattar...@gmail.com>
---
NEWS | 10 +++++++++-
configure.ac | 10 ++++++----
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index 438ec68..5a5ec10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.12.5:
+New in 1.12.6:
* WARNING: Future backward-incompatibilities!
@@ -61,6 +61,14 @@ New in 1.12.5:
giving more useful warnings than a bare "command not found" from a
make recipe would.
+Bugs fixed in 1.12.6:
+
+* Bugs introduced in 1.12.5:
+
+ - The maintainer rebuild rules for Makefiles and aclocal.m4 in Automake's
+ own build system works correctly again.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* Vala support:
- The AM_PROG_VALAC macro has been enhanced to takes two further
diff --git a/configure.ac b/configure.ac
index 7f3dc33..7f126c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,10 +63,12 @@ AC_SUBST([amdir], ["\${pkgvdatadir}/am"])
AC_SUBST([automake_acdir], ["\${datadir}/aclocal-$APIVERSION"])
AC_SUBST([system_acdir], ["\${datadir}/aclocal"])
-# $AUTOMAKE and $ACLOCAL are always run after a "cd $top_srcdir",
-# hence '.' is really what we want for perllibdir, libdir, and acdir.
-ACLOCAL="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\"
--acdir=m4 -I m4"
-AUTOMAKE="perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/automake\"
--libdir=lib"
+# Our build system is bootstrapped with the bleeding-edge versions of
+# aclocal and automake, hence the remake rules must use those versions
+# as well. The extra quoting is to cater to cases when the build
+# directory contains whitespace or shell metacharacters.
+ACLOCAL="\"`pwd`/t/wrap/aclocal-$APIVERSION\""
+AUTOMAKE="\"`pwd`/t/wrap/automake-$APIVERSION\""
AC_PATH_PROG([PERL], [perl])
if test -z "$PERL"; then
--
1.8.0.150.gb0b00a3
