X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bd4576fe4bb666b1072bebeca6b79b827622db5a..ac669e8b922c7ace230294f9bf9a3a2bdfbd19d2:/configure.in

diff --git a/configure.in b/configure.in
index a312b39a..f5ad0581 100644
--- 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.7pre1
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
 
@@ -367,7 +367,10 @@ if test x"$ac_cv_func_connect" = x"no"; then
 fi
 
 AC_SEARCH_LIBS(inet_ntop, resolv)
-AC_SEARCH_LIBS(iconv_open, iconv)
+
+# 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])