Fixes for obsoleted/removed test(1) operator -a

* autogen.sh: Here.
* configure.ac: And here.
* src/gen-lock-obj.sh: And here.
* src/gpg-error.m4 (AM_PATH_GPG_ERROR): And here.
* src/gpgrt-config.in (eval_compare_version): And here.
* src/gpgrt.m4 (AM_PATH_GPGRT): And here.
--

See
GnuPG-bug-id: 7807

4 files changed, 8 insertions, 8 deletions

diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
index 014667f..6e78c5f 100755
--- a/src/gen-lock-obj.sh
+++ b/src/gen-lock-obj.sh
@@ -111,7 +111,7 @@ echo ${ECHO_N} "#define GPGRT_LOCK_INITIALIZER {$LOCK_ABI_VERSION,{{${ECHO_C}"
 
 i=0
 while test "$i" -lt $ac_mtx_size; do
-    if test "$i" -ne 0 -a "$(( $i % 8 ))" -eq 0; then
+    if [ "$i" -ne 0 ] && [ "$(( $i % 8 ))" -eq 0 ]; then
         echo ' \'
         echo ${ECHO_N} "                                    ${ECHO_C}"
     fi
diff --git a/src/gpg-error.m4 b/src/gpg-error.m4
index 2d24071..73725c4 100644
--- a/src/gpg-error.m4
+++ b/src/gpg-error.m4
@@ -155,11 +155,11 @@ AC_DEFUN([AM_PATH_GPG_ERROR],
 [ AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_REQUIRE([_AM_PATH_POSSIBLE_GPG_ERROR_CONFIG])dnl
   AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
-  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+  if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; then
     GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error"
     AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config])
     gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion`
-  elif test x"$GPG_ERROR_CONFIG" != x -a "$GPG_ERROR_CONFIG" != "no"; then
+  elif test x"$GPG_ERROR_CONFIG" != x && test "$GPG_ERROR_CONFIG" != "no"; then
     gpg_error_config_version=`$GPG_ERROR_CONFIG --version`
   else
     gpg_error_config_version="0.0"
diff --git a/src/gpgrt-config.in b/src/gpgrt-config.in
index b4b2ca1..90f8006 100644
--- a/src/gpgrt-config.in
+++ b/src/gpgrt-config.in
@@ -270,7 +270,7 @@ eval_compare_version () {
     ___chunk1=""
     ___chunk2=""
 
-    while [ -n "$___str1" -a -n "$___str2" ]; do
+    while [ -n "$___str1" ] && [ -n "$___str2" ]; do
 	# Trim anything that's not alnum or tilde from the front
 	___str1="$(expr "$___str1" : '[^0-9A-Za-z~]*\(.*\)')"
 	___str2="$(expr "$___str2" : '[^0-9A-Za-z~]*\(.*\)')"
@@ -691,18 +691,18 @@ for p in $PKG_LIST; do
     cleanup_vars_attrs
 done
 
-if [ -z "$want_var" -a -z "$want_attr" ]; then
+if [ -z "$want_var" ] && [ -z "$want_attr" ]; then
     if [ -n "$want_cflags" ]; then
 	output="$output${output:+ }$(sysroot -I $(list_only_once $cflags))"
 	# Backward compatibility to old gpg-error-config
-	if [ $mt = yes -a -n "$mtcflags" ]; then
+	if [ $mt = yes ] && [ -n "$mtcflags" ]; then
 	    output="$output${output:+ }$mtcflags"
 	fi
     fi
     if [ -n "$want_libs" ]; then
 	output="$output${output:+ }$(sysroot -L $(list_only_once_for_libs $libs))"
 	# Backward compatibility to old gpg-error-config
-	if [ $mt = yes -a -n "$mtlibs" ]; then
+	if [ $mt = yes ] && [ -n "$mtlibs" ]; then
 	    output="$output${output:+ }$mtlibs"
 	fi
     fi
diff --git a/src/gpgrt.m4 b/src/gpgrt.m4
index 40fcd1f..215588d 100644
--- a/src/gpgrt.m4
+++ b/src/gpgrt.m4
@@ -57,7 +57,7 @@ AC_DEFUN([AM_PATH_GPGRT],
   min_gpgrt_version=ifelse([$1], ,1.33,$1)
   AC_MSG_CHECKING(for GPG Runtime - version >= $min_gpgrt_version)
   ok=no
-  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no" ; then
+  if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no" ; then
     req_major=`echo $min_gpgrt_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_gpgrt_version | \