diff --git a/autogen.sh b/autogen.sh
index ba3bf13648de40fd2e3ddb5ae26b2d3447250093_YXV0b2dlbi5zaA==..b98317a8ba660a975ae9b413b73b7c94c1308f39_YXV0b2dlbi5zaA== 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -42,7 +42,7 @@
 	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 ba3bf13648de40fd2e3ddb5ae26b2d3447250093_Y29uZmlndXJlLmFj..b98317a8ba660a975ae9b413b73b7c94c1308f39_Y29uZmlndXJlLmFj 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,7 +365,7 @@
     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 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 @@
 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.])