Merge "configure.sh: prefer 'which' over 'hash'"