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 <mthl@gnu.org>

diff --git a/NEWS b/NEWS
index 5ddf6a06e9d50b3efc3bc853c46cb4d7c1f486fe..602b1a25844538439f9eaf163e1937f9d53632a3 100644 (file)
--- 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 04ddb135794e7408b30d5f27eb366a6f5ab42fbc..fccce277b7673209389874da5c9dad57184852cb 100644 (file)
--- 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 a4535bc471b86e91f589488e54d5e5d2c863619e..7350c8e38688b80ed646456e6bbc9f1c29ca8d82 100644 (file)
--- 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].