Remove usage of obsoleted XSI extensions wrt. the "test" command.

diff --git a/configure.in b/configure.in
index 45b87e9b117f16561f381b8c056102e865e086b1..3e31cf2a6de15bb46f65a35fa4ad2d11644d4495 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3927,7 +3927,7 @@ then
        plugin_vserver="yes"
        plugin_wireless="yes"
 
-       if test "x$have_net_ip_vs_h" = "xyes" -o "x$have_ip_vs_h" = "xyes"
+       if test "x$have_net_ip_vs_h" = "xyes" || test "x$have_ip_vs_h" = "xyes"
        then
                plugin_ipvs="yes"
        fi
@@ -4388,7 +4388,7 @@ then
        with_librrd="yes (warning: librrd is not thread-safe)"
 fi
 
-if test "x$with_libiptc" = "xyes" -a "x$with_own_libiptc" = "xyes"
+if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xyes"
 then
        with_libiptc="yes (shipped version)"
 fi

diff --git a/version-gen.sh b/version-gen.sh
index e2f1bec7232fb3abc52709542040de2a990e4e38..f22be7d3aede9a07f6129d49e250a70966682898 100755 (executable)
--- a/version-gen.sh
+++ b/version-gen.sh
@@ -10,7 +10,7 @@ fi
 
 VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`"
 
-if test "x`uname -s`" = "xAIX" -o "x`uname -s`" = "xSunOS" ; then
+if test "x`uname -s`" = "xAIX" || test "x`uname -s`" = "xSunOS" ; then
        echo "$VERSION\c"
 else 
        echo -n "$VERSION"