[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Sun Mar 20 20:34:29 MDT 2011


The branch, master has been updated
       via  d699d81 Enhance the -liconv check for OS X.  Fixes bug 8018.
      from  e5e6d3c Get the branch set right before listing names and handling --delete.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d699d815d6acdf18f73788c21f3be5e6611cfecf
Author: Wayne Davison <wayned at samba.org>
Date:   Sun Mar 20 19:31:58 2011 -0700

    Enhance the -liconv check for OS X.  Fixes bug 8018.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/configure.ac b/configure.ac
index 22672ba..2b5f0a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -445,8 +445,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!
+# For OS X, Solaris, HP-UX, etc.: figure out if -liconv is needed.  We'll
+# accept either iconv_open or libiconv_open, since some include files map
+# the former to the latter.
+AC_SEARCH_LIBS(iconv_open, iconv)
 AC_SEARCH_LIBS(libiconv_open, iconv)
 
 AC_MSG_CHECKING([for iconv declaration])


-- 
The rsync repository.


More information about the rsync-cvs mailing list