[libxslt] Avoid obsolescent `test -a` constructs



commit 383d6ea03bea02c970ca22387313f9f51b4909e5
Author: David Seifert <soap gentoo org>
Date:   Sat Apr 2 23:57:49 2022 +0200

    Avoid obsolescent `test -a` constructs
    
    * POSIX calls the `-a` operator obsolescent and strongly discourages
      its use, instead recommending chaining `test` calls instead:
      https://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html

 autogen.sh   | 2 +-
 configure.ac | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 18ca3e93..9c1c466f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -42,7 +42,7 @@ test -f libxslt/xslt.h  || {
        exit 1
 }
 
-if test -z "$NOCONFIGURE" -a -z "$*"; then
+if test -z "$NOCONFIGURE" && test -z "$*"; then
        echo "I am going to run $srcdir/configure with no arguments - if you wish "
        echo "to pass any to it, please specify them on the $0 command line."
 fi
diff --git a/configure.ac b/configure.ac
index f86c90a5..88ea8dca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,7 +365,7 @@ if test "$enable_static" = "no"; then
     build_static_libs="no"
 fi
 
-if test "$build_shared_libs" = "no" -a "$build_static_libs" = "no"; then
+if test "$build_shared_libs" = "no" && test "$build_static_libs" = "no"; then
     build_static_libs="yes"
 fi
 
@@ -396,7 +396,7 @@ dnl
 dnl Try pkg-config first if nothing is set
 dnl
 
-if test "x$LIBXML_CONFIG_PREFIX" = "x" -a "x$LIBXML_LIBS" = "x"; then
+if test "x$LIBXML_CONFIG_PREFIX" = "x" && test "x$LIBXML_LIBS" = "x"; then
     if test "$build_shared_libs" = "yes"; then
         PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [
             WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`"
@@ -446,7 +446,7 @@ then
 fi
 
 AC_MSG_CHECKING([whether shared libraries will be built (required for plugins)])
-if test "$build_shared_libs" = "no" -a "$with_plugins" = "yes"; then
+if test "$build_shared_libs" = "no" && test "$with_plugins" = "yes"; then
         AC_MSG_RESULT(no)
         AC_MSG_WARN([Disabling plugin support.])
         AC_MSG_WARN([Plugins require that shared libraries be built.])


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]