Merge pull request #42 from seanbright/update-configure

Update configure based on b90f1baa.