Minor fixes to autotools usage.
Pull OSG patches into the repo.