diff --git a/build.sh b/build.sh
index 3822c2bc1b217a9a1c93e730bfbadd0561f7a20f..57f3d4449a99bef83b75b50f425dc548bc9ead60 100755 (executable)
--- a/build.sh
+++ b/build.sh
{
for PROG in "$@"
do
{
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
cat >&2 <<EOF
WARNING: \`$PROG' not found!
Please make sure that \`$PROG' is installed and is in one of the
done
}
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
# 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
check_for_application pkg-config
libtoolize=""
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
then
libtoolize=libtoolize
-else if which glibtoolize >/dev/null 2>&1
-then
- libtoolize=glibtoolize
else
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
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
if test "$GLOBAL_ERROR_INDICATOR" != "0"
then