Fixed erroneous configure script (failed git cherry-pick)