Merge "configure.sh: avoid test -a/-o for compatibility"