c.f. 22307: change test $foo = bar to test x$foo = xbar in configure.ac

ChangeLog

@@ -1,3 +1,8 @@
+2006-03-02  Peter Stephenson  <pws@csr.com>
+
+	* unposted, but see 22307: configure.ac: turn all
+	"test $foo = bar" into "test x$foo = xbar" for safety.
+
 2006-03-01  Peter Stephenson  <pws@csr.com>
 
 	* unposted: MACHINES, README, Config/version.mk: information

configure.ac

@@ -256,7 +256,7 @@ ifdef([fndir],[undefine([fndir])])dnl
 AC_ARG_ENABLE(fndir,
 AC_HELP_STRING([--enable-fndir=DIR], [the directory in which to install functions]),
 dnl ${VERSION} to be determined at compile time.
-[if test $enableval = yes; then
+[if test x$enableval = xyes; then
   fndir=${datadir}/${tzsh_name}/'${VERSION}'/functions
 else
   fndir="$enableval"
@@ -265,7 +265,7 @@ fi], [fndir=${datadir}/${tzsh_name}/'${VERSION}'/functions])
 ifdef([sitefndir],[undefine([sitefndir])])dnl
 AC_ARG_ENABLE(site-fndir,
 AC_HELP_STRING([--enable-site-fndir=DIR], [same for site functions (not version specific)]),
-[if test $enableval = yes; then
+[if test x$enableval = xyes; then
   sitefndir=${datadir}/${tzsh_name}/site-functions
 else
   sitefndir="$enableval"
@@ -292,7 +292,7 @@ ifdef([scriptdir],[undefine([scriptdir])])dnl
 AC_ARG_ENABLE(scriptdir,
 AC_HELP_STRING([--enable-scriptdir=DIR], [the directory in which to install scripts]),
 dnl ${VERSION} to be determined at compile time.
-[if test $enableval = yes; then
+[if test x$enableval = xyes; then
   scriptdir=${datadir}/${tzsh_name}/'${VERSION}'/scripts
 else
   scriptdir="$enableval"
@@ -301,7 +301,7 @@ fi], [scriptdir=${datadir}/${tzsh_name}/'${VERSION}'/scripts])
 ifdef([sitescriptdir],[undefine([sitescriptdir])])dnl
 AC_ARG_ENABLE(site-scriptdir,
 AC_HELP_STRING([--enable-site-scriptdir=DIR], [same for site scripts (not version specific)]),
-[if test $enableval = yes; then
+[if test x$enableval = xyes; then
   sitescriptdir=${datadir}/${tzsh_name}/scripts
 else
   sitescriptdir="$enableval"
@@ -355,7 +355,7 @@ AC_PROG_CC
 
 dnl Check for large file support.
 dnl This needs to be done early to get the stuff into the flags.
-if test $lfs != no; then
+if test x$lfs != xno; then
 dnl Gross hack for ReliantUNIX - GCC does not understand getconf options
 dnl For now just disable LFS in this case
 dnl Any takers?
@@ -477,7 +477,7 @@ zsh_cv_c_have_union_init,
   zsh_cv_c_have_union_init=no)])
 AH_TEMPLATE([HAVE_UNION_INIT],
 [Define to 1 if the compiler can initialise a union.])
-if test $zsh_cv_c_have_union_init = yes; then
+if test x$zsh_cv_c_have_union_init = xyes; then
   AC_DEFINE(HAVE_UNION_INIT)
 fi
 
@@ -490,7 +490,7 @@ zsh_cv_c_broken_signed_to_unsigned_casting,
   zsh_cv_c_broken_signed_to_unsigned_casting=no)])
 AH_TEMPLATE([BROKEN_SIGNED_TO_UNSIGNED_CASTING],
 [Define to 1 if compiler incorrectly cast signed to unsigned.])
-if test $zsh_cv_c_broken_signed_to_unsigned_casting = yes; then
+if test x$zsh_cv_c_broken_signed_to_unsigned_casting = xyes; then
   AC_DEFINE(BROKEN_SIGNED_TO_UNSIGNED_CASTING)
 fi
 
@@ -502,7 +502,7 @@ zsh_cv_c_variable_length_arrays,
   zsh_cv_c_variable_length_arrays=no)])
 AH_TEMPLATE([HAVE_VARIABLE_LENGTH_ARRAYS],
 [Define to 1 if compiler supports variable-length arrays])
-if test $zsh_cv_c_variable_length_arrays = yes; then
+if test x$zsh_cv_c_variable_length_arrays = xyes; then
   AC_DEFINE(HAVE_VARIABLE_LENGTH_ARRAYS)
 fi
 
@@ -556,7 +556,7 @@ AC_CHECK_HEADERS(sys/time.h sys/times.h sys/select.h termcap.h termio.h \
 		 utmp.h utmpx.h sys/types.h pwd.h grp.h poll.h sys/mman.h \
 		 netinet/in_systm.h pcre.h langinfo.h wchar.h stddef.h \
 		 sys/stropts.h iconv.h)
-if test $dynamic = yes; then
+if test x$dynamic = xyes; then
   AC_CHECK_HEADERS(dlfcn.h)
   AC_CHECK_HEADERS(dl.h)
 fi
@@ -564,21 +564,21 @@ fi
 dnl Some SCO systems cannot include both sys/time.h and sys/select.h
 AH_TEMPLATE([TIME_H_SELECT_H_CONFLICTS],
 [Define if sys/time.h and sys/select.h cannot be both included.])
-if test $ac_cv_header_sys_time_h = yes && test $ac_cv_header_sys_select_h = yes; then
+if test x$ac_cv_header_sys_time_h = xyes && test x$ac_cv_header_sys_select_h = xyes; then
   AC_CACHE_CHECK(for conflicts in sys/time.h and sys/select.h,
   zsh_cv_header_time_h_select_h_conflicts,
   [AC_TRY_COMPILE([#include <sys/time.h>
 #include <sys/select.h>], [int i;],
   zsh_cv_header_time_h_select_h_conflicts=no,
   zsh_cv_header_time_h_select_h_conflicts=yes)])
-  if test $zsh_cv_header_time_h_select_h_conflicts = yes; then
+  if test x$zsh_cv_header_time_h_select_h_conflicts = xyes; then
     AC_DEFINE(TIME_H_SELECT_H_CONFLICTS)
   fi
 fi
 
 AH_TEMPLATE([GWINSZ_IN_SYS_IOCTL],
 [Define if TIOCGWINSZ is defined in sys/ioctl.h but not in termios.h.])
-if test $ac_cv_header_termios_h = yes; then
+if test x$ac_cv_header_termios_h = xyes; then
   AC_CACHE_CHECK(TIOCGWINSZ in termios.h,
   zsh_cv_header_termios_h_tiocgwinsz,
   [AC_TRY_LINK([
@@ -592,7 +592,7 @@ if test $ac_cv_header_termios_h = yes; then
 else
   zsh_cv_header_termios_h_tiocgwinsz=no
 fi
-if test $zsh_cv_header_termios_h_tiocgwinsz = no; then
+if test x$zsh_cv_header_termios_h_tiocgwinsz = xno; then
   AC_CACHE_CHECK(TIOCGWINSZ in sys/ioctl.h,
   zsh_cv_header_sys_ioctl_h_tiocgwinsz,
   [AC_TRY_LINK([
@@ -603,7 +603,7 @@ if test $zsh_cv_header_termios_h_tiocgwinsz = no; then
   [int x = TIOCGWINSZ;],
   zsh_cv_header_sys_ioctl_h_tiocgwinsz=yes,
   zsh_cv_header_sys_ioctl_h_tiocgwinsz=no)])
-  if test $zsh_cv_header_sys_ioctl_h_tiocgwinsz = yes; then
+  if test x$zsh_cv_header_sys_ioctl_h_tiocgwinsz = xyes; then
     AC_DEFINE(GWINSZ_IN_SYS_IOCTL)
   fi
 fi
@@ -617,7 +617,7 @@ ac_cv_winsize_in_ptem,
 [struct winsize wsz],
 ac_cv_winsize_in_ptem=yes,
 ac_cv_winsize_in_ptem=no)])
-if test $ac_cv_winsize_in_ptem = yes; then
+if test x$ac_cv_winsize_in_ptem = xyes; then
   AC_DEFINE(WINSIZE_IN_PTEM)
 fi
 
@@ -818,7 +818,7 @@ zsh_cv_decl_ospeed_include_defines,
 zsh_cv_decl_ospeed_include_defines=yes,
 zsh_cv_decl_ospeed_include_defines=no)])
 
-if test $zsh_cv_decl_ospeed_include_defines = no; then
+if test x$zsh_cv_decl_ospeed_include_defines = xno; then
   AC_CACHE_CHECK(if you must define ospeed,
   zsh_cv_decl_ospeed_must_define,
   [AC_TRY_LINK( ,[extern short ospeed; ospeed = 0;],
@@ -830,9 +830,9 @@ AH_TEMPLATE([HAVE_OSPEED],
 [Define to 1 if your termcap library has the ospeed variable])
 AH_TEMPLATE([MUST_DEFINE_OSPEED],
 [Define to 1 if you have ospeed, but it is not defined in termcap.h])
-if test $zsh_cv_decl_ospeed_include_defines = yes; then
+if test x$zsh_cv_decl_ospeed_include_defines = xyes; then
   AC_DEFINE(HAVE_OSPEED)
-elif test $zsh_cv_decl_ospeed_must_define = yes; then
+elif test x$zsh_cv_decl_ospeed_must_define = xyes; then
   AC_DEFINE(HAVE_OSPEED)
   AC_DEFINE(MUST_DEFINE_OSPEED)
 fi
@@ -879,7 +879,7 @@ AH_TEMPLATE([OFF_T_IS_64_BIT],
 [Define to 1 if off_t is 64 bit (for large file support)])
 AH_TEMPLATE([INO_T_IS_64_BIT],
 [Define to 1 if ino_t is 64 bit (for large file support).])
-if test $zsh_cv_long_is_64_bit = yes; then
+if test x$zsh_cv_long_is_64_bit = xyes; then
   AC_DEFINE(LONG_IS_64_BIT)
 else
   AC_CACHE_CHECK(if off_t is 64 bit, zsh_cv_off_t_is_64_bit,
@@ -891,7 +891,7 @@ main() { return sizeof(off_t) < 8; }
   zsh_cv_off_t_is_64_bit=yes,
   zsh_cv_off_t_is_64_bit=no,
   zsh_cv_off_t_is_64_bit=no)])
-  if test $zsh_cv_off_t_is_64_bit = yes; then
+  if test x$zsh_cv_off_t_is_64_bit = xyes; then
     AC_DEFINE(OFF_T_IS_64_BIT)
   fi
 
@@ -904,14 +904,14 @@ main() { return sizeof(ino_t) < 8; }
   zsh_cv_ino_t_is_64_bit=yes,
   zsh_cv_ino_t_is_64_bit=no,
   zsh_cv_ino_t_is_64_bit=no)])
-  if test $zsh_cv_ino_t_is_64_bit = yes; then
+  if test x$zsh_cv_ino_t_is_64_bit = xyes; then
     AC_DEFINE(INO_T_IS_64_BIT)
   fi
 
-  if test $lfs != no -o $zsh_cv_off_t_is_64_bit = yes \
+  if test x$lfs != xno -o x$zsh_cv_off_t_is_64_bit = xyes \
   -o $zsh_cv_ino_t_is_64_bit = yes; then
     AC_CACHE_CHECK(if compiler has a 64 bit type, zsh_cv_64_bit_type,
-    [if test $lfs != yes && test $lfs != no; then
+    [if test x$lfs != xyes && test x$lfs != xno; then
       zsh_64_BIT_TYPE(${lfs}, zsh_cv_64_bit_type, force)
      else
        zsh_64_BIT_TYPE(long long, zsh_cv_64_bit_type)
@@ -958,7 +958,7 @@ AC_CACHE_CHECK(for sigset_t, zsh_cv_type_sigset_t,
   zsh_cv_type_sigset_t=yes, zsh_cv_type_sigset_t=no)])
 AH_TEMPLATE([sigset_t],
 [Define to `unsigned int' if <sys/types.h> or <signal.h> doesn't define])
-if test $zsh_cv_type_sigset_t = no; then
+if test x$zsh_cv_type_sigset_t = xno; then
   AC_DEFINE(sigset_t, unsigned int)
 fi
 
@@ -1084,7 +1084,7 @@ AC_CACHE_CHECK(if we need our own h_errno,
   zsh_cv_decl_h_errno_use_local=no,
   zsh_cv_decl_h_errno_use_local=yes)])
 
-if test $zsh_cv_decl_h_errno_use_local = yes; then
+if test x$zsh_cv_decl_h_errno_use_local = xyes; then
   AC_DEFINE(USE_LOCAL_H_ERRNO)
 fi
 
@@ -1161,7 +1161,7 @@ main()
   fi,
   zsh_cv_func_tgetent_accepts_null=no,
   zsh_cv_func_tgetent_accepts_null=no)])
-if test $zsh_cv_func_tgetent_accepts_null = yes; then
+if test x$zsh_cv_func_tgetent_accepts_null = xyes; then
   AC_DEFINE(TGETENT_ACCEPTS_NULL)
 fi
 AC_CACHE_CHECK(if tgetent returns 0 on success,
@@ -1190,7 +1190,7 @@ main()
   zsh_cv_func_tgetent_zero_success=no)])
 AH_TEMPLATE([TGETENT_SUCCESS],
 [Define to what tgetent() returns on success (0 on HP-UX X/Open curses).])
-if test $zsh_cv_func_tgetent_zero_success = yes; then
+if test x$zsh_cv_func_tgetent_zero_success = xyes; then
   AC_DEFINE(TGETENT_SUCCESS, 0)
 else
   AC_DEFINE(TGETENT_SUCCESS, 1)
@@ -1201,7 +1201,7 @@ if test x$ac_cv_func_mmap_fixed_mapped = xyes; then
   AC_CHECK_FUNCS(munmap msync)
 fi
 
-if test $ac_cv_func_setpgrp = yes; then
+if test x$ac_cv_func_setpgrp = xyes; then
   AC_FUNC_GETPGRP
 else
   dnl If there is no setpgrp, the test for getpgrp(void) will fail
@@ -1212,7 +1212,7 @@ else
   AC_DEFINE(GETPGRP_VOID)
 fi
 
-if test $dynamic = yes; then
+if test x$dynamic = xyes; then
   AC_CHECK_FUNCS(dlopen dlerror dlsym dlclose load loadquery loadbind unload \
 		shl_load shl_unload shl_findsym)
 fi
@@ -1231,13 +1231,13 @@ AH_TEMPLATE([SYSV_SIGNALS],
 AH_TEMPLATE([NO_SIGNAL_BLOCKING],
 [Define to 1 if you have no signal blocking at all (bummer).])
 AC_MSG_CHECKING(what style of signals to use)
-if test $ac_cv_func_sigaction = yes && test $ac_cv_func_sigprocmask = yes; then
+if test x$ac_cv_func_sigaction = xyes && test x$ac_cv_func_sigprocmask = xyes; then
   signals_style=POSIX_SIGNALS
   AC_DEFINE(POSIX_SIGNALS)
-elif test $ac_cv_func_sigblock = yes && test $ac_cv_func_sigsetmask = yes; then
+elif test x$ac_cv_func_sigblock = xyes && test x$ac_cv_func_sigsetmask = xyes; then
   signals_style=BSD_SIGNALS
   AC_DEFINE(BSD_SIGNALS)
-elif test $ac_cv_func_sighold = yes && test $ac_cv_func_sigrelse = yes; then
+elif test x$ac_cv_func_sighold = xyes && test x$ac_cv_func_sigrelse = xyes; then
   signals_style=SYSV_SIGNALS
   AC_DEFINE(SYSV_SIGNALS)
 else
@@ -1287,7 +1287,7 @@ do
   wc -l | sed 's/[ 	]//g'`
   test "x$nsigs" != x && test "$nsigs" -ge 7 && break
 done
-if test $SIGNAL_H = "/dev/null"; then
+if test x$SIGNAL_H = x"/dev/null"; then
   AC_MSG_ERROR(SIGNAL MACROS NOT FOUND:  please report to developers)
 fi
 zsh_cv_path_signal_h=$SIGNAL_H
@@ -1321,7 +1321,7 @@ do
   wc -l | sed 's/[ 	]//g'`
   test "x$nerrs" != x && test "$nerrs" -ge 7 && break
 done
-if test $ERRNO_H = "/dev/null"; then
+if test x$ERRNO_H = x"/dev/null"; then
   AC_MSG_ERROR(ERROR MACROS NOT FOUND:  please report to developers)
 fi
 zsh_cv_path_errno_h=$ERRNO_H
@@ -1360,7 +1360,7 @@ do
   break
 done
 zsh_cv_path_rlimit_h=$RESOURCE_H
-if test $RESOURCE_H = "/dev/null" && test $ac_cv_func_getrlimit = yes; then
+if test x$RESOURCE_H = x"/dev/null" && test x$ac_cv_func_getrlimit = xyes; then
   AC_MSG_WARN(RLIMIT MACROS NOT FOUND:  please report to developers)
 fi])
 RLIMITS_INC_H=$zsh_cv_path_rlimit_h
@@ -1396,7 +1396,7 @@ main(){struct rlimit r;exit(sizeof(r.rlim_cur) <= sizeof(long));}],
 zsh_cv_rlim_t_is_longer=yes,
 zsh_cv_rlim_t_is_longer=no,
 zsh_cv_rlim_t_is_longer=yes)])
-if test $zsh_cv_rlim_t_is_longer = yes; then
+if test x$zsh_cv_rlim_t_is_longer = xyes; then
   AC_CACHE_CHECK(if rlim_t is a quad,
   zsh_cv_rlim_t_is_quad_t,
   [AC_TRY_RUN([
@@ -1415,7 +1415,7 @@ main() {
   zsh_cv_rlim_t_is_quad_t=yes,
   zsh_cv_rlim_t_is_quad_t=no,
   zsh_cv_rlim_t_is_quad_t=no)])
-  if test $zsh_cv_rlim_t_is_quad_t = yes; then
+  if test x$zsh_cv_rlim_t_is_quad_t = xyes; then
     AC_DEFINE(RLIM_T_IS_QUAD_T)
     DEFAULT_RLIM_T=quad_t
   else
@@ -1434,7 +1434,7 @@ else
   zsh_cv_type_rlim_t_is_unsigned=yes,
   zsh_cv_type_rlim_t_is_unsigned=no,
   zsh_cv_type_rlim_t_is_unsigned=no)])
-  if test $zsh_cv_type_rlim_t_is_unsigned = yes; then
+  if test x$zsh_cv_type_rlim_t_is_unsigned = xyes; then
     AC_DEFINE(RLIM_T_IS_UNSIGNED)
     DEFAULT_RLIM_T="unsigned $DEFAULT_RLIM_T"
   fi
@@ -1450,7 +1450,7 @@ AC_CACHE_CHECK(for rlim_t, zsh_cv_type_rlim_t,
 [rlim_t l;],
 zsh_cv_type_rlim_t=yes,
 zsh_cv_type_rlim_t=no)])
-if test $zsh_cv_type_rlim_t = no; then
+if test x$zsh_cv_type_rlim_t = xno; then
   AC_DEFINE_UNQUOTED(rlim_t, $DEFAULT_RLIM_T)
 fi
 
@@ -1497,7 +1497,7 @@ return ret;
   zsh_cv_rlimit_vmem_is_rss=no,
   zsh_cv_rlimit_vmem_is_rss=no)])
 
-if test $zsh_cv_rlimit_vmem_is_rss = yes; then
+if test x$zsh_cv_rlimit_vmem_is_rss = xyes; then
   AC_DEFINE(RLIMIT_VMEM_IS_RSS)
 fi
 
@@ -1524,7 +1524,7 @@ return ret;
   zsh_cv_rlimit_vmem_is_as=no,
   zsh_cv_rlimit_vmem_is_as=no)])
 
-if test $zsh_cv_rlimit_vmem_is_as = yes; then
+if test x$zsh_cv_rlimit_vmem_is_as = xyes; then
   AC_DEFINE(RLIMIT_VMEM_IS_AS)
 fi
 
@@ -1551,7 +1551,7 @@ return ret;
   zsh_cv_rlimit_rss_is_as=no,
   zsh_cv_rlimit_rss_is_as=no)])
 
-if test $zsh_cv_rlimit_rss_is_as = yes; then
+if test x$zsh_cv_rlimit_rss_is_as = xyes; then
   AC_DEFINE(RLIMIT_RSS_IS_AS)
 fi
 
@@ -1559,7 +1559,7 @@ fi
 dnl --------------------------------------------
 dnl Check for members of struct rusage
 dnl --------------------------------------------
-if test $ac_cv_func_getrusage = yes; then
+if test x$ac_cv_func_getrusage = xyes; then
   AC_CHECK_MEMBERS([struct rusage.ru_maxrss,
 		    struct rusage.ru_ixrss,
 		    struct rusage.ru_idrss,
@@ -1611,7 +1611,7 @@ AC_CACHE_CHECK(for /dev/fd filesystem, zsh_cv_sys_path_dev_fd,
 [for zsh_cv_sys_path_dev_fd in /proc/self/fd /dev/fd no; do
    test x`echo ok|(exec 3<&0; cat $zsh_cv_sys_path_dev_fd/3 2>/dev/null;)` = xok && break
  done])
-if test $zsh_cv_sys_path_dev_fd != no; then
+if test x$zsh_cv_sys_path_dev_fd != xno; then
   AC_DEFINE_UNQUOTED(PATH_DEV_FD, "$zsh_cv_sys_path_dev_fd")
 fi
 
@@ -1622,7 +1622,7 @@ AC_CACHE_CHECK(for RFS superroot directory, zsh_cv_sys_superroot,
 [test -d /../.LOCALROOT && zsh_cv_sys_superroot=yes || zsh_cv_sys_superroot=no])
 AH_TEMPLATE([HAVE_SUPERROOT],
 [Define to 1 if you have RFS superroot directory.])
-if test $zsh_cv_sys_superroot = yes; then
+if test x$zsh_cv_sys_superroot = xyes; then
   AC_DEFINE(HAVE_SUPERROOT)
 fi
 
@@ -1635,7 +1635,7 @@ zsh_cv_use_getcwd,
  esac])
 AH_TEMPLATE([USE_GETCWD],
 [Define to 1 if you need to use the native getcwd.])
-if test $zsh_cv_use_getcwd = yes; then
+if test x$zsh_cv_use_getcwd = xyes; then
   AC_DEFINE(USE_GETCWD)
 fi
 
@@ -1647,7 +1647,7 @@ AH_TEMPLATE([HAVE_NIS],
 AC_CACHE_CHECK(for NIS, zsh_cv_sys_nis,
 [test -f /usr/bin/ypcat && /usr/bin/ypcat passwd.byname > /dev/null 2>&1 && \
 zsh_cv_sys_nis=yes || zsh_cv_sys_nis=no])
-if test $zsh_cv_sys_nis = yes; then
+if test x$zsh_cv_sys_nis = xyes; then
   AC_DEFINE(HAVE_NIS)
 fi
 
@@ -1657,10 +1657,10 @@ dnl -----------------
 AH_TEMPLATE([HAVE_NIS_PLUS],
 [Define to 1 if you have NISPLUS.])
 AC_CACHE_CHECK(for NIS+, zsh_cv_sys_nis_plus,
-[test $ac_cv_func_nis_list = yes && test -f /usr/bin/nisls && \
+[test x$ac_cv_func_nis_list = xyes && test -f /usr/bin/nisls && \
  /usr/bin/nisls > /dev/null 2>&1 && \
 zsh_cv_sys_nis_plus=yes || zsh_cv_sys_nis_plus=no])
-if test $zsh_cv_sys_nis_plus = yes; then
+if test x$zsh_cv_sys_nis_plus = xyes; then
   AC_DEFINE(HAVE_NIS_PLUS)
 fi
 
@@ -1682,7 +1682,7 @@ double brk();], [int i;],
 zsh_cv_header_unistd_h_brk_proto=no, zsh_cv_header_unistd_h_brk_proto=yes)])
 AH_TEMPLATE([HAVE_BRK_PROTO],
 [Define to 1 if there is a prototype defined for brk() on your system.])
-if test $zsh_cv_header_unistd_h_brk_proto = yes; then
+if test x$zsh_cv_header_unistd_h_brk_proto = xyes; then
   AC_DEFINE(HAVE_BRK_PROTO)
 fi
 
@@ -1693,7 +1693,7 @@ double sbrk();], [int i;],
 zsh_cv_header_unistd_h_sbrk_proto=no, zsh_cv_header_unistd_h_sbrk_proto=yes)])
 AH_TEMPLATE([HAVE_SBRK_PROTO],
 [Define to 1 if there is a prototype defined for sbrk() on your system.])
-if test $zsh_cv_header_unistd_h_sbrk_proto = yes; then
+if test x$zsh_cv_header_unistd_h_sbrk_proto = xyes; then
   AC_DEFINE(HAVE_SBRK_PROTO)
 fi
 
@@ -1709,7 +1709,7 @@ if test "$ac_cv_prog_cc_stdc" != no; then
    int mknod(double x);], [int i;],
   zsh_cv_header_sys_stat_h_mknod_proto=no,
   zsh_cv_header_sys_stat_h_mknod_proto=yes)])
-  if test $zsh_cv_header_sys_stat_h_mknod_proto = yes; then
+  if test x$zsh_cv_header_sys_stat_h_mknod_proto = xyes; then
     AC_DEFINE(HAVE_MKNOD_PROTO)
   fi
 fi
@@ -1730,7 +1730,7 @@ double ioctl();], [int i;],
 zsh_cv_header_unistd_h_termios_h_ioctl_proto=no,
 zsh_cv_header_unistd_h_termios_h_ioctl_proto=yes)])
 
-if test $zsh_cv_header_unistd_h_termios_h_ioctl_proto = no; then
+if test x$zsh_cv_header_unistd_h_termios_h_ioctl_proto = xno; then
   AC_CACHE_CHECK(for ioctl prototype in <sys/ioctl.h>,
   zsh_cv_header_sys_ioctl_h_ioctl_proto,
   [AC_TRY_COMPILE([#include <sys/ioctl.h>
@@ -1743,13 +1743,13 @@ fi
 
 AH_TEMPLATE([HAVE_IOCTL_PROTO],
 [Define to 1 if there is a prototype defined for ioctl() on your system.])
-if test $zsh_cv_header_unistd_h_termios_h_ioctl_proto = yes || \
+if test x$zsh_cv_header_unistd_h_termios_h_ioctl_proto = xyes || \
-   test $zsh_cv_header_sys_ioctl_h_ioctl_proto = yes; then
+   test x$zsh_cv_header_sys_ioctl_h_ioctl_proto = xyes; then
   AC_DEFINE(HAVE_IOCTL_PROTO)
 fi
 AH_TEMPLATE([IOCTL_IN_SYS_IOCTL],
 [Define to 1 if we must include <sys/ioctl.h> to get a prototype for ioctl().])
-if test $zsh_cv_header_sys_ioctl_h_ioctl_proto = yes; then
+if test x$zsh_cv_header_sys_ioctl_h_ioctl_proto = xyes; then
   AC_DEFINE(IOCTL_IN_SYS_IOCTL)
 fi
 
@@ -1758,13 +1758,13 @@ dnl select() defined in <sys/socket.h>, ie BeOS R4.51
 dnl -------------------
 AH_TEMPLATE([SELECT_IN_SYS_SOCKET_H],
 [Define to 1 if select() is defined in <sys/socket.h>, ie BeOS R4.51])
-if test $ac_cv_header_sys_select_h != yes; then
+if test x$ac_cv_header_sys_select_h != xyes; then
   AC_CACHE_CHECK(for select() in <sys/socket.h>,
   zsh_cv_header_socket_h_select_proto,
   [AC_TRY_COMPILE([#include <sys/socket.h>], [fd_set fd;],
   zsh_cv_header_socket_h_select_proto=yes, 
   zsh_cv_header_socket_h_select_proto=no)])
-  if test $zsh_cv_header_socket_h_select_proto = yes; then
+  if test x$zsh_cv_header_socket_h_select_proto = xyes; then
     AC_DEFINE(SELECT_IN_SYS_SOCKET_H)
   fi
 fi
@@ -1811,7 +1811,7 @@ main()
 fi])
 AH_TEMPLATE([HAVE_FIFOS],
 [Define to 1 if system has working FIFOs.])
-if test $zsh_cv_sys_fifo = yes; then
+if test x$zsh_cv_sys_fifo = xyes; then
   AC_DEFINE(HAVE_FIFOS)
 fi
 dnl ---------------------
@@ -1826,7 +1826,7 @@ else
 fi])
 AH_TEMPLATE([SH_USE_BSD_ECHO],
 [Define to 1 if /bin/sh does not interpret \ escape sequences.])
-if test $zsh_cv_prog_sh_echo_escape = no; then
+if test x$zsh_cv_prog_sh_echo_escape = xno; then
   AC_DEFINE(SH_USE_BSD_ECHO)
 fi
 
@@ -1860,7 +1860,7 @@ main()
   zsh_cv_sys_link=yes)])
 AH_TEMPLATE([HAVE_LINK],
 [Define to 1 if system has working link().])
-if test $zsh_cv_sys_link = yes; then
+if test x$zsh_cv_sys_link = xyes; then
   AC_DEFINE(HAVE_LINK)
 fi
 
@@ -1886,7 +1886,7 @@ main()
   zsh_cv_sys_killesrch=yes)])
 AH_TEMPLATE([BROKEN_KILL_ESRCH],
 [Define to 1 if kill(pid, 0) doesn't return ESRCH, ie BeOS R4.51.])
-if test $zsh_cv_sys_killesrch = no; then
+if test x$zsh_cv_sys_killesrch = xno; then
   AC_DEFINE(BROKEN_KILL_ESRCH)
 fi
 
@@ -1896,7 +1896,7 @@ dnl for instance, BeOS R4.51 is broken.
 dnl -----------
 AH_TEMPLATE([BROKEN_POSIX_SIGSUSPEND],
 Define to 1 if sigsuspend() is broken, ie BeOS R4.51.])
-if test $signals_style = POSIX_SIGNALS; then
+if test x$signals_style = xPOSIX_SIGNALS; then
     AC_CACHE_CHECK(if POSIX sigsuspend() works,
     zsh_cv_sys_sigsuspend,
     [AC_TRY_RUN([
@@ -1928,7 +1928,7 @@ main() {
       zsh_cv_sys_sigsuspend=yes,
       zsh_cv_sys_sigsuspend=no,
       zsh_cv_sys_sigsuspend=yes)])
-    if test $zsh_cv_sys_sigsuspend = no; then
+    if test x$zsh_cv_sys_sigsuspend = xno; then
       AC_DEFINE(BROKEN_POSIX_SIGSUSPEND)
     fi
 fi
@@ -1995,7 +1995,7 @@ dnl test by looking up two usernames that shouldn't succeed, and compare entry
 dnl -----------
 AH_TEMPLATE([GETPWNAM_FAKED],
 [Define to 1 if getpwnam() is faked, ie BeOS R4.51.])
-if test $ac_cv_func_getpwnam = yes; then
+if test x$ac_cv_func_getpwnam = xyes; then
     AC_CACHE_CHECK(if getpwnam() is faked,
     zsh_cv_sys_getpwnam_faked,
     [AC_TRY_RUN([
@@ -2014,7 +2014,7 @@ main() {
       zsh_cv_sys_getpwnam_faked=no,
       zsh_cv_sys_getpwnam_faked=yes,
       zsh_cv_sys_getpwnam_faked=no)])
-    if test $zsh_cv_sys_getpwnam_faked = yes; then
+    if test x$zsh_cv_sys_getpwnam_faked = xyes; then
       AC_DEFINE(GETPWNAM_FAKED)
     fi
 fi
@@ -2051,10 +2051,10 @@ dnl these is by defining _GNU_SOURCE.
 dnl -------
 AH_TEMPLATE([USE_DEV_PTMX],
 [Define to 1 if all the kit for using /dev/ptmx for ptys is available.])
-if test $ac_cv_have_dev_ptmx = yes && \
+if test x$ac_cv_have_dev_ptmx = xyes && \
-   test $ac_cv_func_grantpt = yes && \
+   test x$ac_cv_func_grantpt = xyes && \
-   test $ac_cv_func_unlockpt = yes && \
+   test x$ac_cv_func_unlockpt = xyes && \
-   test $ac_cv_func_ptsname = yes; then
+   test x$ac_cv_func_ptsname = xyes; then
    AC_CACHE_CHECK([if /dev/ptmx is usable],
    ac_cv_use_dev_ptmx,
    [AC_TRY_COMPILE([#ifdef __linux
@@ -2064,7 +2064,7 @@ if test $ac_cv_have_dev_ptmx = yes && \
 int ptsname();], ,
    ac_cv_use_dev_ptmx=no,
    ac_cv_use_dev_ptmx=yes)])
-   if test $ac_cv_use_dev_ptmx = yes; then
+   if test x$ac_cv_use_dev_ptmx = xyes; then
      AC_DEFINE(USE_DEV_PTMX)
    fi
 fi
@@ -2095,7 +2095,7 @@ AC_HELP_STRING([--enable-multibyte], [support multibyte chars in the zsh line ed
 ])
 AH_TEMPLATE([MULTIBYTE_SUPPORT],
 [Define to 1 if you want support for multibyte character sets.])
-if test $zsh_cv_c_zle_unicode_support = yes; then
+if test x$zsh_cv_c_zle_unicode_support = xyes; then
   AC_DEFINE(MULTIBYTE_SUPPORT)
 fi
 
@@ -2226,7 +2226,7 @@ char *argv[];
   zsh_cv_sys_elf=no,
   zsh_cv_sys_elf=yes)])
   DL_EXT="${DL_EXT=so}"
-  if test $zsh_cv_sys_elf = yes; then
+  if test x$zsh_cv_sys_elf = xyes; then
     case "$host" in
       mips-sni-sysv4*)
         # Forcibly set ld to native compiler to avoid obscure GCC problems
@@ -2286,7 +2286,7 @@ char *argv[];
     solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
     darwin*)      DLLDFLAGS="${DLLDFLAGS=-bundle -flat_namespace -undefined suppress}" ;;
     openbsd*)
-      if test $zsh_cv_sys_elf = yes; then
+      if test x$zsh_cv_sys_elf = xyes; then
 	DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
       else
 	case "$host_os" in
@@ -2304,7 +2304,7 @@ char *argv[];
     *-hpux*)  EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
     *-freebsd[3-9]*|*-kfreebsd*|*-linux*|gnu*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
     *openbsd*)
-       if test $zsh_cv_sys_elf = yes; then
+       if test x$zsh_cv_sys_elf = xyes; then
 	 EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}"
        fi
     ;;
@@ -2566,7 +2566,7 @@ for modfile in `cd ${srcdir}; echo */*.mdd */*/*.mdd`; do
     case "$link" in
       static) result="name=$name modfile=$modfile link=static auto=yes${load}$f"
 	      ;;
-      dynamic) if test $dynamic != no; then
+      dynamic) if test x$dynamic != xno; then
 		  result="name=$name modfile=$modfile link=dynamic\
  auto=yes${load}$f"
 	       else
@@ -2574,7 +2574,7 @@ for modfile in `cd ${srcdir}; echo */*.mdd */*/*.mdd`; do
  auto=yes load=no$f"
 	       fi
 	       ;;
-      either) if test $dynamic != no; then
+      either) if test x$dynamic != xno; then
 		result="name=$name modfile=$modfile link=dynamic\
  auto=yes${load}$f"
 	      else