X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=build.sh;h=57f3d4449a99bef83b75b50f425dc548bc9ead60;hp=3822c2bc1b217a9a1c93e730bfbadd0561f7a20f;hb=ad0a12907bf80b4f0deec217b8379dd08c490dbc;hpb=c87da66245197f489bb0e9efffc23538cf07e70b

diff --git a/build.sh b/build.sh
index 3822c2bc..57f3d444 100755
--- a/build.sh
+++ b/build.sh
@@ -6,7 +6,8 @@ check_for_application ()
 {
 	for PROG in "$@"
 	do
-		if ! which "$PROG" >/dev/null 2>&1; then
+		which "$PROG" >/dev/null 2>&1
+		if test $? -ne 0; then
 			cat >&2 <<EOF
 WARNING: \`$PROG' not found!
     Please make sure that \`$PROG' is installed and is in one of the
@@ -17,7 +18,7 @@ EOF
 	done
 }
 
-check_for_application lex yacc autoheader aclocal automake autoconf
+check_for_application lex bison autoheader aclocal automake autoconf
 
 # Actually we don't need the pkg-config executable, but we need the M4 macros.
 # We check for `pkg-config' here and hope that M4 macros will then be
@@ -25,20 +26,24 @@ check_for_application lex yacc autoheader aclocal automake autoconf
 check_for_application pkg-config
 
 libtoolize=""
-if which libtoolize >/dev/null 2>&1
+libtoolize --version >/dev/null 2>/dev/null
+if test $? -eq 0
 then
 	libtoolize=libtoolize
-else if which glibtoolize >/dev/null 2>&1
-then
-	libtoolize=glibtoolize
 else
-	cat >&2 <<EOF
+	glibtoolize --version >/dev/null 2>/dev/null
+	if test $? -eq 0
+	then
+		libtoolize=glibtoolize
+	else
+		cat >&2 <<EOF
 WARNING: Neither \`libtoolize' nor \`glibtoolize' have been found!
     Please make sure that one of them is installed and is in one of the
     directories listed in the PATH environment variable.
 EOF
-	GLOBAL_ERROR_INDICATOR=1
-fi; fi
+		GLOBAL_ERROR_INDICATOR=1
+	fi
+ fi
 
 if test "$GLOBAL_ERROR_INDICATOR" != "0"
 then