From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 28 Jun 2010 15:52:19 +0000 (+0200)
Subject: Remove usage of obsoleted XSI extensions wrt. the "test" command.
X-Git-Tag: collectd-4.9.3~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=09e1bfaed8475b7f81befe8581fb09711795b13b

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

diff --git a/configure.in b/configure.in
index 45b87e9b..3e31cf2a 100644
--- 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 e2f1bec7..f22be7d3 100755
--- 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"