Updates to support building PHP 5.4 from source