Merge config from 1.9.32.1 

Trunk tracking had the $buildtype $os_name and $arch_name variables used before they were set.
This would cause the ./configure to fail when searching for the psol binaries.