about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2005-02-04 10:32:05 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2005-02-04 10:32:05 +0000
commit832650823499a1f4f55bbe1262b8dfc050299c25 (patch)
tree43c206ecdc5bdf7377e6204dc50a612105bdfaa6
parent3fc610c59fb74e1510a69605b01b2f3f8f51079f (diff)
downloadzsh-832650823499a1f4f55bbe1262b8dfc050299c25.tar.gz
zsh-832650823499a1f4f55bbe1262b8dfc050299c25.tar.xz
zsh-832650823499a1f4f55bbe1262b8dfc050299c25.zip
Motoi Washida: libiconv test needed on Mac OS X
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac9
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index aef61e7d6..1a31df69f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-04  Peter Stephenson  <pws@csr.com>
+
+	* Motoi Washida: 20785: configure.ac: libiconv test needed
+	for Mac OS X 3.
+
 2005-02-02  Peter Stephenson  <pws@csr.com>
 
 	* 20777: Test/A06assign.ztst, Test/C02cond.ztst: tests for
diff --git a/configure.ac b/configure.ac
index 321cf56fb..6c5ba06f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -729,10 +729,11 @@ AC_CHECK_LIB(socket, socket)
 
 AC_CHECK_LIB(iconv, iconv)
 
-if test "$host_os" = cygwin; then
-dnl cygwin iconv() is really libiconv()
-AC_CHECK_LIB(iconv, libiconv)
-fi
+case "$host_os" in
+  cygwin | darwin*)
+    dnl cygwin iconv() is really libiconv()
+    AC_CHECK_LIB(iconv, libiconv) ;;
+esac
 
 if test x$enable_pcre = xyes; then
 dnl pcre-config should probably be employed here