From 048979e10ffcbe67dad11e3b58365ecc66232e5a Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 12 Sep 2010 16:38:46 +0200 Subject: [PATCH] tests: work around zsh use of $options variable. * tests/getopt-m4sh.at: Rename $options to $opts, the former is special for zsh 4.3.10. Signed-off-by: Ralf Wildenhues --- ChangeLog | 4 ++++ tests/getopt-m4sh.at | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e8557ba2..b9abe8a37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-09-12 Ralf Wildenhues + tests: work around zsh use of $options variable. + * tests/getopt-m4sh.at: Rename $options to $opts, the former is + special for zsh 4.3.10. + Fix AC_NO_EXECUTABLES test failure on IRIX 6.5. * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS) [irix]: Cache result of link check for -Wl,-exported_symbol. diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at index 1c2ac2649..75a7bf6d3 100644 --- a/tests/getopt-m4sh.at +++ b/tests/getopt-m4sh.at @@ -37,14 +37,14 @@ AT_DATA([options.m4sh], nl=' ' list= -options= +opts= M4SH_GETOPTS( [a!], [--append], [], [func_append list "$optarg$nl"], - [f], [--force], [], [options="$options force"], - [i], [--install], [], [options="$options install"], - [v], [--verbose], [], [options="$options verbose"], - [!], [--ltdl], [false],[options="$options ltdl=$optarg"], -[echo "$list" $options]) + [f], [--force], [], [opts="$opts force"], + [i], [--install], [], [opts="$opts install"], + [v], [--verbose], [], [opts="$opts verbose"], + [!], [--ltdl], [false],[opts="$opts ltdl=$optarg"], +[echo "$list" $opts]) ]]) m4_pattern_forbid([m4_include]) m4_pattern_forbid([AS_INIT]) -- 2.47.2