summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2011-03-20 19:31:58 -0700
committerWayne Davison <wayned@samba.org>2011-03-20 19:31:58 -0700
commitbc6363f9ab0ece866755eef863bb55f98517f2c8 (patch)
tree1b30cb62fbb05b954d34ffdeb2fc48e6ffb3e627
parente71130fd7739562cd190a92d3f8bcbda02168892 (diff)
downloadrsync-bc6363f9ab0ece866755eef863bb55f98517f2c8.tar.gz
Enhance the -liconv check for OS X. Fixes bug 8018.
-rw-r--r--configure.ac6
1 files changed, 4 insertions, 2 deletions
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])