[empathy] configure.ac: improve portability of test(1) calls
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] configure.ac: improve portability of test(1) calls
- Date: Wed, 26 May 2010 10:28:17 +0000 (UTC)
commit 961f968f204547c34ad419786447d1904783497f
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 5b8de91..35afac4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -465,7 +465,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
@@ -479,7 +479,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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]