From fd244f28f5637e13009f75b6962d03401b22149c Mon Sep 17 00:00:00 2001 From: Thomas Jahns Date: Mon, 29 Jun 2015 09:50:02 +0200 Subject: aclocal: Avoid problematic string interpolation This fixes bug#20903. Thanks to Eric Bavier for reporting this issue. * bin/aclocal.in (automake_includes): Avoid problematic string interpolation. * NEWS: Update. * THANKS: Thank Eric Bavier. Signed-off-by: Mathieu Lirzin --- NEWS | 3 +++ THANKS | 1 + bin/aclocal.in | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 5ddf6a06e..602b1a258 100644 --- a/NEWS +++ b/NEWS @@ -110,6 +110,9 @@ New in 1.16: This was the second part of automake bug#13928. + - Installed 'aclocal' m4 macros can now accept installation directories + containing '@' characters (automake bug#20903) + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ New in 1.15.1: diff --git a/THANKS b/THANKS index 04ddb1357..fccce277b 100644 --- a/THANKS +++ b/THANKS @@ -111,6 +111,7 @@ Elmar Hoffmann elho@elho.net Elrond Elrond@Wunder-Nett.org Enrico Scholz enrico.scholz@informatik.tu-chemnitz.de Erez Zadok ezk@cs.columbia.edu +Eric Bavier bavier@cray.com Eric Blake eblake@redhat.com Eric Dorland eric@debian.org Eric Magnien emagnien@club-internet.fr diff --git a/bin/aclocal.in b/bin/aclocal.in index a4535bc47..7350c8e38 100644 --- a/bin/aclocal.in +++ b/bin/aclocal.in @@ -69,7 +69,7 @@ $perl_threads = 0; # ACLOCAL_PATH environment variable, and reset with the '--system-acdir' # option. my @user_includes = (); -my @automake_includes = ("@datadir@/aclocal-$APIVERSION"); +my @automake_includes = ('@datadir@/aclocal-' . $APIVERSION); my @system_includes = ('@datadir@/aclocal'); # Whether we should copy M4 file in $user_includes[0]. -- cgit v1.2.1