From: Wayne Davison <wayned@samba.org>
Date: Mon, 21 Mar 2011 02:31:58 +0000 (-0700)
Subject: Enhance the -liconv check for OS X.  Fixes bug 8018.
X-Git-Tag: v3.0.8~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bc6363f9ab0ece866755eef863bb55f98517f2c8;p=thirdparty%2Frsync.git

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

diff --git a/configure.ac b/configure.ac
index 19bfa633..e5c4f292 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,8 +428,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])