From cde022163b2e104f23c7ea70288fc9136fe2b765 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 15 Oct 2008 15:59:42 +0200 Subject: [PATCH] Use "test x$foo = xyes" to avoid upsetting Libtool's sh.test. * lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL, _AS_SHELL_FN_WORK): Use "test x$foo = xyes". --- ChangeLog | 6 ++++++ lib/m4sugar/m4sh.m4 | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7cbb6704..b22ad65d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-10-15 Paolo Bonzini + + Use "test x$foo = xyes" to avoid upsetting Libtool's sh.test. + * lib/m4sugar/m4sh.m4 (_AS_DETECT_BETTER_SHELL, _AS_SHELL_FN_WORK): Use + "test x$foo = xyes". + 2008-10-15 Paolo Bonzini Trim down the size of the better-shell test. diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4 index 20b57724..983e2e09 100644 --- a/lib/m4sugar/m4sh.m4 +++ b/lib/m4sugar/m4sh.m4 @@ -203,7 +203,7 @@ dnl Remove any tests from suggested that are also required AS_IF([_AS_RUN(["$as_required"])], [as_have_required=yes], [as_have_required=no])]) - AS_IF([test $as_have_required = yes && _AS_RUN(["$as_suggested"])], + AS_IF([test x$as_have_required = xyes && _AS_RUN(["$as_suggested"])], [], [as_candidate_shells= _AS_PATH_WALK([/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH], @@ -231,7 +231,7 @@ dnl Remove any tests from suggested that are also required export CONFIG_SHELL exec "$CONFIG_SHELL" "$as_myself" ${1+"$[@]"}]) - AS_IF([test $as_have_required = no], + AS_IF([test x$as_have_required = xno], [echo This script requires a shell more modern than all the echo shells that I found on your system. Please install a echo modern shell, or manually run the script under such a @@ -374,7 +374,7 @@ AS_IF([as_func_ret_failure], AS_IF([( set x; as_func_ret_success y && test x = "[$]1" )], [], [exitcode=1 echo positional parameters were not saved.]) -test $exitcode = 0[]dnl +test x$exitcode = x0[]dnl ])# _AS_SHELL_FN_WORK