- Changed the check for iconv_open() to just iconv().

- Got rid of the --enable-iconv option for now.

configure.in

@@ -490,7 +490,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
     memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
     strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
     setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
-    strerror putenv iconv_open locale_charset nl_langinfo \
+    strerror putenv iconv locale_charset nl_langinfo \
     sigaction sigprocmask)
 
 AC_CHECK_FUNCS(getpgrp tcgetpgrp)
@@ -498,23 +498,6 @@ if test $ac_cv_func_getpgrp = yes; then
     AC_FUNC_GETPGRP
 fi
 
-AC_ARG_ENABLE(iconv,
-    AC_HELP_STRING([--disable-iconv],
-	    [disable rsync's --iconv option]),
-    [], [enable_iconv=$ac_cv_func_iconv_open])
-AH_TEMPLATE([ICONV_OPTION],
-[Define if you want the --iconv option.  Specifing a value will set the
-default iconv setting (a NULL means no --iconv processing by default).])
-if test x"$enable_iconv" != x"no"; then
-	if test x"$enable_iconv" = x"yes"; then
-		AC_DEFINE(ICONV_OPTION, NULL)
-	else
-		AC_DEFINE_UNQUOTED(ICONV_OPTION, "$enable_iconv")
-	fi
-	AC_DEFINE(UTF8_CHARSET, "UTF-8", [String to pass to iconv() for the UTF-8 charset.])
-fi
-
-
 # Determine whether chown follows symlinks (it should).
 AC_CACHE_CHECK([whether chown() dereferences symlinks],rsync_cv_chown_follows_symlink,[
   AC_TRY_RUN([