Skip to content
Snippets Groups Projects
Commit b98317a8ba66 authored by David Seifert's avatar David Seifert
Browse files

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
parent ba3bf13648de
No related branches found
No related tags found
No related merge requests found
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
exit 1 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 "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." echo "to pass any to it, please specify them on the $0 command line."
fi fi
......
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
build_static_libs="no" build_static_libs="no"
fi 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" build_static_libs="yes"
fi fi
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
dnl Try pkg-config first if nothing is set dnl Try pkg-config first if nothing is set
dnl 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 if test "$build_shared_libs" = "yes"; then
PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [ PKG_CHECK_MODULES([LIBXML], [libxml-2.0 >= $LIBXML_REQUIRED_VERSION], [
WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`" WITH_MODULES="`$PKG_CONFIG --variable=modules libxml-2.0`"
...@@ -446,7 +446,7 @@ ...@@ -446,7 +446,7 @@
fi fi
AC_MSG_CHECKING([whether shared libraries will be built (required for plugins)]) 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_RESULT(no)
AC_MSG_WARN([Disabling plugin support.]) AC_MSG_WARN([Disabling plugin support.])
AC_MSG_WARN([Plugins require that shared libraries be built.]) AC_MSG_WARN([Plugins require that shared libraries be built.])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment