diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-17 20:30:11 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-17 20:30:17 +0100 |
| commit | 18143e7cfe66eaddffa481211ad4e340a11a22f4 (patch) | |
| tree | ff38f357bb7dd7a0639c67d8b5e03fa11c33535c /configure.ac | |
| parent | 1efb88cadad61a031d1c297310bc2634562f2e87 (diff) | |
| parent | 2f584fa4f117c5d745b0b7b4f57686f2f83424b0 (diff) | |
| download | automake-18143e7cfe66eaddffa481211ad4e340a11a22f4.tar.gz | |
Merge branch 'maint'
* maint:
build: fix rebuild rules for Makefile.in and aclocal.m4
hacking: release procedure: fix order of some steps
maint: post-release minor version bump
release: stable release 1.12.5
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 00ccc1f75..de218daa9 100644 --- a/configure.ac +++ b/configure.ac @@ -63,16 +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. -# Use '-I' with aclocal so that our own *.m4 files in m4/ gets included, -# not copied, in aclocal.m4. -ACLOCAL="\ - perllibdir=\"`pwd`/lib$PATH_SEPARATOR./lib\" \"`pwd`/aclocal\" \ - --automake-acdir=m4 --system-acdir=m4/acdir -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 |