Added better OS X configure support