Renamed sum_table -> hash_table.

[rsync/rsync.git] / configure.in

diff --git a/configure.in b/configure.in
index 53617f5..48bd533 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.59)
 
-RSYNC_VERSION=2.6.7cvs
+RSYNC_VERSION=2.6.7pre2
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 
@@ -368,6 +368,10 @@ fi
 
 AC_SEARCH_LIBS(inet_ntop, resolv)
 
+# Solaris and HP-UX weirdness:
+# Search for libiconv_open (not iconv_open) to discover if -liconv is needed!
+AC_SEARCH_LIBS(libiconv_open, iconv)
+
 dnl AC_MSG_NOTICE([Looking in libraries: $LIBS])
 
 AC_CHECK_FUNCS(inet_ntop, , [AC_LIBOBJ(lib/inet_ntop)])
@@ -498,23 +502,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([