18303: fix some always-true test evaluations.

2 files changed, 19 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 822fc1b13..99f5b4c82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-26  Clint Adams  <clint@zsh.org>
+
+	* 18303: zshconfig.ac: fix some always-true test evaluations.
+
 2003-02-26  Oliver Kiddle  <opk@zsh.org>
 
 	* 18299: Completion/Base/Core/_main_complete,
diff --git a/zshconfig.ac b/zshconfig.ac
index 29dc3103c..33ca83f78 100644
--- a/zshconfig.ac
+++ b/zshconfig.ac
@@ -235,8 +235,8 @@ ifdef([function_subdirs],[undefine([function_subdirs])])
 AC_ARG_ENABLE(function-subdirs,
 [  --enable-function-subdirs  install functions in subdirectories])
 
-if test "x${enable_function_subdirs}" != x -a \
-  "x${enable_function_subdirs}" != xno; then
+if test "x${enable_function_subdirs}" != x &&
+  test "x${enable_function_subdirs}" != xno; then
   FUNCTIONS_SUBDIRS=yes
 else
   FUNCTIONS_SUBDIRS=no
@@ -279,7 +279,7 @@ if test $lfs != no; then
 dnl Gross hack for ReliantUNIX - GCC does not understand getconf options
 dnl For now just disable LFS in this case
 dnl Any takers?
-  if test "$host" = mips-sni-sysv4 -a -n "$GCC"; then
+  if test "$host" = mips-sni-sysv4 && test -n "$GCC"; then
     : 
   else
     zsh_LARGE_FILE_SUPPORT
@@ -501,7 +501,7 @@ if test $dynamic = yes; then
 fi
 
 dnl Some SCO systems cannot include both sys/time.h and sys/select.h
-if test $ac_cv_header_sys_time_h = yes -a $ac_cv_header_sys_select_h = yes; then
+if test $ac_cv_header_sys_time_h = yes && test $ac_cv_header_sys_select_h = yes; 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>
@@ -753,7 +753,7 @@ main() { return sizeof(ino_t) < 8; }
   if test $lfs != no -o $zsh_cv_off_t_is_64_bit = yes \
   -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 -a $lfs != no; then
+    [if test $lfs != yes && test $lfs != no; then
       zsh_64_BIT_TYPE(${lfs}, zsh_cv_64_bit_type, force)
      else
        zsh_64_BIT_TYPE(long long, zsh_cv_64_bit_type)
@@ -766,8 +766,8 @@ main() { return sizeof(ino_t) < 8; }
        dnl As a last resort, if we know off_t has 64 bits, use that as
        dnl the 64-bit integer type.  I don't dare try ino_t since there's
        dnl probably nothing to stop that being unsigned.
-       if test "$zsh_cv_64_bit_type" = no -a \
-       "$zsh_cv_off_t_is_64_bit" = yes; then
+       if test "$zsh_cv_64_bit_type" = no &&
+          test "$zsh_cv_off_t_is_64_bit" = yes; then
          zsh_64_BIT_TYPE(off_t, zsh_cv_64_bit_type)
        fi
      fi])
@@ -1051,13 +1051,13 @@ dnl CHECK SIGNALS
 dnl -------------
 dnl What style of signal do you have (POSIX, BSD, or SYSV)?
 AC_MSG_CHECKING(what style of signals to use)
-if test $ac_cv_func_sigaction = yes -a $ac_cv_func_sigprocmask = yes; then
+if test $ac_cv_func_sigaction = yes && test $ac_cv_func_sigprocmask = yes; then
   signals_style=POSIX_SIGNALS
   AC_DEFINE(POSIX_SIGNALS)
-elif test $ac_cv_func_sigblock = yes -a $ac_cv_func_sigsetmask = yes; then
+elif test $ac_cv_func_sigblock = yes && test $ac_cv_func_sigsetmask = yes; then
   signals_style=BSD_SIGNALS
   AC_DEFINE(BSD_SIGNALS)
-elif test $ac_cv_func_sighold = yes -a $ac_cv_func_sigrelse = yes; then
+elif test $ac_cv_func_sighold = yes && test $ac_cv_func_sigrelse = yes; then
   signals_style=SYSV_SIGNALS
   AC_DEFINE(SYSV_SIGNALS)
 else
@@ -1132,7 +1132,7 @@ do
   break
 done
 zsh_cv_path_rlimit_h=$RESOURCE_H
-if test $RESOURCE_H = "/dev/null" -a $ac_cv_func_getrlimit = yes; then
+if test $RESOURCE_H = "/dev/null" && test $ac_cv_func_getrlimit = yes; then
   AC_MSG_WARN(RLIMIT MACROS NOT FOUND:  please report to developers)
 fi])
 RLIMITS_INC_H=$zsh_cv_path_rlimit_h
@@ -1451,7 +1451,7 @@ dnl -----------
 dnl if POSIX, test for working sigsuspend().
 dnl for instance, BeOS R4.51 is broken.
 dnl -----------
-if test $signals_style=POSIX_SIGNALS; then
+if test $signals_style = POSIX_SIGNALS; then
     AC_CACHE_CHECK(if POSIX sigsuspend() works,
     zsh_cv_sys_sigsuspend,
     [AC_TRY_RUN([
@@ -1492,7 +1492,7 @@ dnl -----------
 dnl if found tcsetpgrp, test to see if it actually works
 dnl for instance, BeOS R4.51 does not support it yet
 dnl -----------
-if test -t 0 -a $ac_cv_func_tcsetpgrp=yes; then
+if test -t 0 && test $ac_cv_func_tcsetpgrp = yes; then
     AC_CACHE_CHECK(if tcsetpgrp() actually works,
     zsh_cv_sys_tcsetpgrp,
     [AC_TRY_RUN([
@@ -1517,7 +1517,7 @@ dnl test for faked getpwnam() entry, ie a single entry returned for any username
 dnl for instance, BeOS R4.51 is not multiuser yet, and fakes getpwnam()
 dnl test by looking up two usernames that shouldn't succeed, and compare entry
 dnl -----------
-if test $ac_cv_func_getpwnam=yes; then
+if test $ac_cv_func_getpwnam = yes; then
     AC_CACHE_CHECK(if getpwnam() is faked,
     zsh_cv_sys_getpwnam_faked,
     [AC_TRY_RUN([
@@ -1946,7 +1946,7 @@ for modfile in `cd ${srcdir}; echo */*.mdd */*/*.mdd`; do
   load=
   functions=
   . ${srcdir}/$modfile
-  if test x$name != x -a x"$link" != x; then
+  if test x$name != x && test x"$link" != x; then
     case "$userlist" in
     *" $name "*) # not autogenerated, keep original
                 grep "^name=$name " ${CONFIG_MODULES}.old