Fix configure and remove additional lines in build files.