diff options
| author | Wayne Davison <wayned@samba.org> | 2011-03-20 19:31:58 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2011-03-20 19:33:28 -0700 |
| commit | d699d815d6acdf18f73788c21f3be5e6611cfecf (patch) | |
| tree | 9b63e91792f241218dfa9b76911c3f0a5a6a9fe5 /configure.ac | |
| parent | e5e6d3c410e4ca2d9b70def299c21a90245b41b8 (diff) | |
| download | android_external_rsync-d699d815d6acdf18f73788c21f3be5e6611cfecf.tar.gz android_external_rsync-d699d815d6acdf18f73788c21f3be5e6611cfecf.tar.bz2 android_external_rsync-d699d815d6acdf18f73788c21f3be5e6611cfecf.zip | |
Enhance the -liconv check for OS X. Fixes bug 8018.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 22672ba5..2b5f0a7b 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]) |