Re-fixing ITS#2667: test -a and test -o unportable, use && and ||.

contrib/ldaptcl/configure.in

@@ -52,7 +52,8 @@ AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.0 binaries from DIR],
 
 case "$with_tk" in
     yes)
-	if test -f $exec_prefix/lib/tkConfig.sh -a $exec_prefix/lib/tkxConfig.sh
+	if test -f $exec_prefix/lib/tkConfig.sh &&
+	   test -f $exec_prefix/lib/tkxConfig.sh
 	then
 	    :
 	else

tests/run.in

@@ -55,10 +55,10 @@ AC_THREADS=threads@BUILD_THREAD@
 AC_LIBS_DYNAMIC=lib@BUILD_LIBS_DYNAMIC@
 
 # sanitize
-if test "${AC_ldap}" = "ldapmod" -a "${AC_LIBS_DYNAMIC}" = "static" ; then
+if test "${AC_ldap}" = "ldapmod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
 	AC_ldap="ldapno"
 fi
-if test "${AC_meta}" = "metamod" -a "${AC_LIBS_DYNAMIC}" = "static" ; then
+if test "${AC_meta}" = "metamod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
 	AC_meta="metano"
 fi
 

tests/scripts/test045-syncreplication-proxied

@@ -141,7 +141,7 @@ for i in 0 1 2 3 4 5; do
 	$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \
 		'(objectClass=*)' > /dev/null 2>&1
 	RC=$?
-	if test $RC = 0 -o $RC = 53 ; then
+	if test $RC = 0 || test $RC = 53 ; then
 		break
 	fi
 	echo "Waiting 5 seconds for slapd to start..."