build.sh: look in m4 dir for macro's

[collectd.git] / build.sh

diff --git a/build.sh b/build.sh
index 57f3d44..97e55d8 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -18,12 +18,7 @@ EOF
        done
 }
 
-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
-# 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
@@ -53,7 +48,7 @@ fi
 set -x
 
 autoheader \
-&& aclocal \
-&& $libtoolize --ltdl --copy --force \
+&& aclocal -I m4 \
+&& $libtoolize --copy --force \
 && automake --add-missing --copy \
 && autoconf