Commit e43dbbde authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Fix normalisation of path to find

The old code didn't work on Mac OS X, as "which" returns successfully
when it can't find the program.
parent 1a74e146
...@@ -611,11 +611,15 @@ echo foo > conftest.txt ...@@ -611,11 +611,15 @@ echo foo > conftest.txt
$fp_prog_find conftest.txt -print > conftest.out 2>&1 $fp_prog_find conftest.txt -print > conftest.out 2>&1
if grep '^conftest.txt$' conftest.out > /dev/null 2>&1 ; then if grep '^conftest.txt$' conftest.out > /dev/null 2>&1 ; then
# OK, looks like a real "find". # OK, looks like a real "find".
if which cygpath 1> /dev/null 2> /dev/null case $HostPlatform in
then *mingw32)
fp_prog_find=`cygpath --mixed "$fp_prog_find"` if test x${OSTYPE} != xmsys
AC_MSG_NOTICE([Converted to "$fp_prog_find"]) then
fi fp_prog_find="`cygpath --mixed ${fp_prog_find}`"
AC_MSG_NOTICE([normalized find command to $fp_prog_find])
fi ;;
*) ;;
esac
FindCmd="$fp_prog_find" FindCmd="$fp_prog_find"
else else
# Found a poor WinDoze version of "find", ignore it. # Found a poor WinDoze version of "find", ignore it.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment