Renamed sum_table -> hash_table.

[rsync/rsync.git] / configure.in

diff --git a/configure.in b/configure.in
index 25a4314..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])
 
@@ -135,7 +135,7 @@ AC_MSG_RESULT($NOBODY_GROUP)
 AC_DEFINE_UNQUOTED(NOBODY_USER, "nobody", [unprivileged user--e.g. nobody])
 AC_DEFINE_UNQUOTED(NOBODY_GROUP, "$NOBODY_GROUP", [unprivileged group for unprivileged user])
 
-# arrgh. libc in the current debian stable screws up the largefile
+# arrgh. libc in some old debian version screwed up the largefile
 # stuff, getting byte range locking wrong
 AC_CACHE_CHECK([for broken largefile support],rsync_cv_HAVE_BROKEN_LARGEFILE,[
 AC_TRY_RUN([
@@ -299,7 +299,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h \
     unistd.h utime.h grp.h compat.h sys/param.h ctype.h sys/wait.h \
     sys/ioctl.h sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h \
     sys/un.h glob.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
-    netdb.h malloc.h float.h limits.h iconv.h)
+    netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h)
 AC_HEADER_MAJOR
 
 AC_CHECK_SIZEOF(int)
@@ -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)])
@@ -490,24 +494,14 @@ 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)
+    strerror putenv iconv_open locale_charset nl_langinfo \
+    sigaction sigprocmask)
 
 AC_CHECK_FUNCS(getpgrp tcgetpgrp)
 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 to 1 if you have iconv() and want rsync's --iconv option.])
-if test x"$enable_iconv" = x"yes"; then
-       AC_DEFINE(ICONV_OPTION)
-fi
-
-
 # Determine whether chown follows symlinks (it should).
 AC_CACHE_CHECK([whether chown() dereferences symlinks],rsync_cv_chown_follows_symlink,[
   AC_TRY_RUN([