Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
e5e6d3c
)
Enhance the -liconv check for OS X. Fixes bug 8018.
author
Wayne Davison
<wayned@samba.org>
Mon, 21 Mar 2011 02:31:58 +0000
(19:31 -0700)
committer
Wayne Davison
<wayned@samba.org>
Mon, 21 Mar 2011 02:33:28 +0000
(19:33 -0700)
configure.ac
patch
|
blob
|
blame
|
history
diff --git
a/configure.ac
b/configure.ac
index
22672ba
..
2b5f0a7
100644
(file)
--- 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])