Checking for grep and sed has been rationalised, and now emit the same messages as for the other tools.

/trunk/configure |   53    36    17     0 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 36 insertions(+), 17 deletions(-)
This commit is contained in:
Yann E. MORIN" 2009-02-01 18:40:16 +00:00
parent 430ce931e1
commit 7eda231a2d

53
configure vendored
View File

@ -280,14 +280,24 @@ if [ -n "${grep}" ]; then
echo "${grep} (cached)" echo "${grep} (cached)"
else else
grep="$( which grep 2>/dev/null )" grep="$( which grep 2>/dev/null )"
[ -z "${grep}" ] && do_error "not found" if [ -z "${grep}" ]; then
echo "${grep}" echo "not found"
else
echo "${grep}"
printf "Checking whether '${grep}' supports -E... "
if echo 'foo' |"${grep}" -E 'foo' >/dev/null 2>&1; then
echo "yes"
else
echo "no"
grep=
fi
fi
fi fi
printf "Checking whether '${grep}' supports -E... " if [ -z "${grep}" ]; then
if echo 'foo' |"${grep}" -E 'foo' >/dev/null 2>&1; then echo "Either you are missing entirely the needed tool,"
echo "yes" echo "or the version you have is tool old."
else echo "You can give the path to this tool using: --with-grep=PATH"
do_error "no" do_error "Bailing out..."
fi fi
printf "Checking for 'sed'... " printf "Checking for 'sed'... "
@ -295,17 +305,26 @@ if [ -n "${sed}" ]; then
echo "${sed} (cached)" echo "${sed} (cached)"
else else
sed="$( which sed 2>/dev/null )" sed="$( which sed 2>/dev/null )"
[ -z "${sed}" ] && do_error "not found" if [ -z "${sed}" ]; then
echo "${sed}" echo "not found"
else
echo "${sed}"
printf "Checking wether '${sed}' supports -i and -e... "
touch .ct-ng.sed.test
if "${sed}" -r -i -e 's/foo/bar/' .ct-ng.sed.test >/dev/null 2>&1; then
echo "yes"
else
echo "no"
sed=
fi
rm -f .ct-ng.sed.test
fi
fi fi
printf "Checking wether '${sed}' supports -i and -e... " if [ -z "${sed}" ]; then
touch .ct-ng.sed.test echo "Either you are missing entirely the needed tool,"
if "${sed}" -r -i -e 's/foo/bar/' .ct-ng.sed.test >/dev/null 2>&1; then echo "or the version you have is tool old."
rm -f .ct-ng.sed.test echo "You can give the path to this tool using: --with-sed=PATH"
echo "yes" do_error "Bailing out..."
else
rm -f .ct-ng.sed.test
do_error "no"
fi fi
# Check the existence of absolutely required tools # Check the existence of absolutely required tools