[REBASED PATCH 5/9] Fix issue with GROW diversion in testsuite

[Charles Wilson]

---
 tests/sysroot.at |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

This patch is necessary to fixup 4/9 (which was Paolo's 5/8). Apparently newer
autoconf implements things in such a way that using AS_DIRNAME inside of
AT_CHECK causes a problem with m4: cannot expand diversion GROW...


diff --git a/tests/sysroot.at b/tests/sysroot.at
index 5fabc25..bf65999 100644
--- a/tests/sysroot.at
+++ b/tests/sysroot.at
@@ -46,10 +46,17 @@ done
 AT_CHECK([test -n "$prefix" || exit 77])
 
 sysroot=`pwd`/sys-root
+
+# difficult to use AS_DIRNAME inside the AT_CHECK macro, so
+# encapsulate as a shell function.
+local_dirname() {
+  AS_DIRNAME(["$[]1"])
+}
+
 AT_CHECK([
 (cd "$gcc_sysroot" && find ".$prefix/bin" ".$prefix/lib" \! -type d) | \
 while read file; do
-  dir=`AS_DIRNAME(["$sysroot/$file"])`
+  dir=`local_dirname "$sysroot/$file"`
   test -d "$dir" || mkdir -p "$dir"
   ln -sf "$gcc_sysroot/$file" "$sysroot/$file"
 done])
-- 
1.7.1