X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=build.sh;h=57f3d4449a99bef83b75b50f425dc548bc9ead60;hb=ed1dae66a930598319e7c16405ff36b1229c3c36;hp=804b2e2593b6d497e0a15dbd77f6a4e35343c446;hpb=a940e2555464956ae7b61d8d0d742f2acc001c5f;p=collectd.git

diff --git a/build.sh b/build.sh
index 804b2e25..97e55d85 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,12 +18,7 @@ EOF
 	done
 }
 
-check_for_application lex yacc 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
-# available, too.
-check_for_application pkg-config
+check_for_application lex bison autoheader aclocal automake autoconf pkg-config
 
 libtoolize=""
 libtoolize --version >/dev/null 2>/dev/null
@@ -52,7 +48,7 @@ fi
 set -x
 
 autoheader \
-&& aclocal \
-&& $libtoolize --ltdl --copy --force \
+&& aclocal -I m4 \
+&& $libtoolize --copy --force \
 && automake --add-missing --copy \
 && autoconf