Allow BIN_CONVERT and BIN_AWK to be set on the commandline when

autogen.sh is run.

Originally committed to SVN as r2529.
This commit is contained in:
Amar Takhar 2008-12-27 07:21:04 +00:00
parent ef1eeb6fe2
commit 400be89f48
1 changed files with 18 additions and 8 deletions

View File

@ -170,27 +170,37 @@ else
DIE=1 DIE=1
fi fi
WHICH_CONVERT=`which convert`
if test -z "$BIN_CONVERT"; then
BIN_CONVERT=`which convert`
fi
echo -n "checking for ImageMagick 'convert' utility ... " echo -n "checking for ImageMagick 'convert' utility ... "
if test -x "$WHICH_CONVERT"; then if test -x "$BIN_CONVERT"; then
BIN_CONVERT=$WHICH_CONVERT
echo $BIN_CONVERT echo $BIN_CONVERT
else else
echo "not found"
echo echo
echo " You must have 'convert' installed from the" echo " You must have 'convert' installed from the"
echo " ImageMagick project." echo " ImageMagick project. Please set BIN_CONVERT or"
echo " Add 'convert' to your PATH"
echo echo
DIE=1 DIE=1
fi fi
WHICH_AWK=`which awk`
if test -z "$BIN_AWK"; then
BIN_AWK=`which awk`
fi
echo -n "checking for AWK ... " echo -n "checking for AWK ... "
if test -x "$WHICH_AWK"; then if test -x "$BIN_AWK"; then
BIN_AWK=$WHICH_AWK
echo $BIN_AWK echo $BIN_AWK
else else
echo "not found"
echo echo
echo " You must have 'awk' installed" echo " You must have 'awk' installed. Please set"
echo " BIN_AWK or add it to your PATH."
echo echo
DIE=1 DIE=1
fi fi