[gtk-vnc] use "test C1 && test C2", not "test C1 -a C2" etc

[Daniel P. Berrange <dberrange src gnome org>]

commit 4e1ad9285dc4fc665bbf2f28a4087abc51fdd209
Author: Daniel P. Berrange <berrange redhat com>
Date:   Fri Dec 9 17:25:32 2011 +0000

    use "test C1 && test C2", not "test C1 -a C2" etc

 acinclude.m4 |    2 +-
 configure.ac |    8 ++++----
 git.mk       |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index 37528a6..7b4129a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -37,7 +37,7 @@ AC_DEFUN([gl_COMPILER_FLAGS],
    echo 'int x;' >conftest.c
    $CC $CFLAGS -c conftest.c 2>conftest.err
    ret=$?
-   if test $ret != 0 -o -s conftest.err -o $has_option = "no"; then
+   if test $ret != 0 || test -s conftest.err || test $has_option = "no"; then
        AC_MSG_RESULT(no)
    else
        AC_MSG_RESULT(yes)
diff --git a/configure.ac b/configure.ac
index 238cb63..f66050c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -233,7 +233,7 @@ SASL_CFLAGS=
 SASL_LIBS=
 enable_sasl=no
 if test "x$with_sasl" != "xno"; then
-  if test "x$with_sasl" != "xyes" -a "x$with_sasl" != "xcheck"; then
+  if test "x$with_sasl" != "xyes" && test "x$with_sasl" != "xcheck"; then
     SASL_CFLAGS="-I$with_sasl"
     SASL_LIBS="-L$with_sasl"
   fi
@@ -251,7 +251,7 @@ if test "x$with_sasl" != "xno"; then
   if test "x$with_sasl" != "xno" ; then
     AC_CHECK_LIB([sasl2], [sasl_client_init],[with_sasl2=yes],[with_sasl2=no])
   fi
-  if test "x$with_sasl2" = "xno" -a "x$with_sasl" != "xno" ; then
+  if test "x$with_sasl2" = "xno" && test "x$with_sasl" != "xno" ; then
     AC_CHECK_LIB([sasl], [sasl_client_init],[with_sasl=yes],[with_sasl=no])
   fi
   if test "x$with_sasl2" = "xyes"; then
@@ -263,13 +263,13 @@ if test "x$with_sasl" != "xno"; then
   fi
   CFLAGS="$old_cflags"
   LIBS="$old_libs"
-  if test "x$with_sasl2" = "xyes" -o "x$with_sasl" = "xyes" ; then
+  if test "x$with_sasl2" = "xyes" || test "x$with_sasl" = "xyes" ; then
     AC_DEFINE_UNQUOTED([HAVE_SASL], 1,
       [whether Cyrus SASL is available for authentication])
     enable_sasl=yes
   fi
 fi
-AM_CONDITIONAL([HAVE_SASL], [test "x$with_sasl2" = "xyes" -o "x$with_sasl" = "xyes"])
+AM_CONDITIONAL([HAVE_SASL], [test "x$with_sasl2" = "xyes" || test "x$with_sasl" = "xyes"])
 AC_SUBST([SASL_CFLAGS])
 AC_SUBST([SASL_LIBS])
 
diff --git a/git.mk b/git.mk
index ffb2edb..6458c4a 100644
--- a/git.mk
+++ b/git.mk
@@ -84,7 +84,7 @@ git-mk-install:
 $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 	@echo Generating $@; \
 	{ \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
+		if test "x$(DOC_MODULE)" = x || test "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
 			for x in \
 				$(DOC_MODULE)-decl-list.txt \
 				$(DOC_MODULE)-decl.txt \
@@ -93,7 +93,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
 				xml html \
 			; do echo /$$x; done; \
 		fi; \
-		if test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
+		if test "x$(DOC_MODULE)" = x || test "x$(DOC_LINGUAS)" = x; then :; else \
 			for x in \
 				$(_DOC_C_DOCS) \
 				$(_DOC_LC_DOCS) \