diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | configure.ac | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index b6e105def..0dc281bcf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ +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> + * unposted: 4.2.4 released. + * 20777: Test/A06assign.ztst, Test/C02cond.ztst: tests for users/8422 and 20774. diff --git a/configure.ac b/configure.ac index e6f7e8261..99d1c49df 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 |