[empathy/gnome-2-30] configure.ac: improve portability of test(1) calls

[Guillaume Desmottes <gdesmott src gnome org>]

commit 2de67b1620da339380e817ecaf5cdf0c4f459202
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Wed May 26 11:08:01 2010 +0100

    configure.ac: improve portability of test(1) calls
    
    The "==" operator isn't POSIX (use "="), and the -a and -o connectors
    aren't POSIX (use test foo && test bar, test foo || test bar).

 configure.ac |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cb27614..7b81b73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -464,7 +464,7 @@ AC_ARG_ENABLE(favourite_contacts,
                              [Enable favourite contacts]), ,
                              enable_favourite_contacts=no)
 
-if test "x$enable_favourite_contacts" != "xno" -o "x$chain_enable_favourite_contacts" == "xyes"; then
+if test "x$enable_favourite_contacts" != "xno" || test "x$chain_enable_favourite_contacts" = "xyes"; then
     PKG_CHECK_MODULES(TELEPATHY_LOGGER,
     [
        telepathy-logger
@@ -478,7 +478,7 @@ else
    have_favourite_contacts="no"
 fi
 
-if test "x$enable_favourite_contacts" = "xyes" -a "x$have_favourite_contacts" != "xyes"; then
+if test "x$enable_favourite_contacts" = "xyes" && test "x$have_favourite_contacts" != "xyes"; then
    AC_MSG_ERROR([Couldn't find favourite contacts dependencies.])
 fi