From: Timo Sirainen <tss@iki.fi>
Date: Thu, 10 Jul 2003 14:45:58 +0000 (+0300)
Subject: test -o and -a are apparently non-POSIX. not using.
X-Git-Tag: 1.1.alpha1~4495
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50a55395ee1e6c0019de38c87dd8a11b6f71a550;p=thirdparty%2Fdovecot%2Fcore.git

test -o and -a are apparently non-POSIX. not using.

--HG--
branch : HEAD
---

diff --git a/configure.in b/configure.in
index cd45c55122..e72d4e700a 100644
--- a/configure.in
+++ b/configure.in
@@ -496,7 +496,7 @@ AC_DEFINE_UNQUOTED(INDEX_ALIGN_SIZE, $index_align, Required index alignment)
 
 dnl * find random source
 AC_MSG_CHECKING([for /dev/urandom])
-if test -c /dev/urandom -o -s /dev/urandom; then
+if test -c /dev/urandom || test -s /dev/urandom; then
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_DEV_URANDOM,, Define if you have /dev/urandom)
   have_random_source=yes
@@ -728,7 +728,7 @@ if test $want_gnutls = yes; then
 	],, -lgcrypt)
 fi
 
-if test "$want_openssl" = "yes" -a "$have_ssl" = "no"; then
+if test "$want_openssl" = "yes" && test "$have_ssl" = "no"; then
   if pkg-config --exists openssl; then
     PKG_CHECK_MODULES(SSL, openssl)
     CFLAGS="$CFLAGS $SSL_CFLAGS"