From d45c77caacd134faa08f87cf8f5206499c5b1958 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 6 May 2008 14:29:56 +0200
Subject: [PATCH] configure.in: Don't use `test -a'.

Some old/weird versions of sh and/or test don't support the `-a' (`and')
argument.
---
 configure.in | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/configure.in b/configure.in
index 1577f10f..d9dd13a3 100644
--- a/configure.in
+++ b/configure.in
@@ -951,7 +951,8 @@ then
 fi
 
 AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])],
-[	if test "x$withval" != "xno" -a "x$withval" != "xyes"
+[	if test "x$withval" != "xno" \
+		&& test "x$withval" != "xyes"
 	then
 		LDFLAGS="$LDFLAGS -L$withval/lib"
 		CPPFLAGS="$CPPFLAGS -I$withval/include"
@@ -1492,7 +1493,8 @@ fi
 
 AC_SUBST(PERL, "$perl_interpreter")
 
-if test "x$with_libperl" = "xyes" -a -n "$perl_interpreter"
+if test "x$with_libperl" = "xyes" \
+	&& test -n "$perl_interpreter"
 then
   SAVE_CFLAGS=$CFLAGS
   SAVE_LDFLAGS=$LDFLAGS
@@ -1727,7 +1729,8 @@ with_xmms_cflags=""
 with_xmms_libs=""
 AC_ARG_WITH(libxmms, [AS_HELP_STRING([--with-libxmms@<:@=PREFIX@:>@], [Path to libxmms.])],
 [
-	if test "x$withval" != "xno" -a "x$withval" != "xyes"
+	if test "x$withval" != "xno" \
+		&& test "x$withval" != "xyes"
 	then
 		if test -f "$withval" && test -x "$withval";
 		then
@@ -2186,7 +2189,8 @@ AC_PLUGIN([wireless],    [$plugin_wireless],   [Wireless statistics])
 AC_PLUGIN([xmms],        [$with_libxmms],      [XMMS statistics])
 
 dnl ip_vs.h
-if test "x$ac_system" = "xLinux" -a "x$have_net_ip_vs_h$have_ip_vs_h" = "xnono"
+if test "x$ac_system" = "xLinux" \
+	&& test "x$have_net_ip_vs_h$have_ip_vs_h" = "xnono"
 then
 	enable_ipvs="$enable_ipvs (ip_vs.h not found)"
 fi
@@ -2223,7 +2227,8 @@ AC_SUBST(PERL_BINDINGS_OPTIONS)
 
 AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
 
-if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes"
+if test "x$with_liboping" = "xyes" \
+	&& test "x$with_own_liboping" = "xyes"
 then
 	with_liboping="yes (shipped version)"
 fi
@@ -2235,7 +2240,8 @@ else
 	enable_perl="no (needs libperl)"
 fi
 
-if test "x$with_perl_bindings" = "xyes" -a "x$PERL_BINDINGS_OPTIONS" != "x"
+if test "x$with_perl_bindings" = "xyes" \
+	&& test "x$PERL_BINDINGS_OPTIONS" != "x"
 then
 	with_perl_bindings="yes ($PERL_BINDINGS_OPTIONS)"
 fi
-- 
2.11.0