Added --enable-iconv and cleaned up the other enable/disable options.