Merged.
Modified configure files.