*** configure.in.orig	Fri Dec 28 22:02:53 2007
--- configure.in	Sat Dec 29 00:26:14 2007
***************
*** 551,559 ****
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
!     strerror putenv iconv_open locale_charset nl_langinfo getxattr \
      extattr_get_link sigaction sigprocmask setattrlist)
  
  AC_CHECK_FUNCS(getpgrp tcgetpgrp)
  if test $ac_cv_func_getpgrp = yes; then
      AC_FUNC_GETPGRP
--- 551,570 ----
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid glob strpbrk \
      strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
      setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
!     strerror putenv locale_charset nl_langinfo getxattr \
      extattr_get_link sigaction sigprocmask setattrlist)
  
+ dnl Under cygwin with libiconv 1.11 /usr/include/iconv.h defines iconv_open as
+ dnl libiconv_open
+ 
+ AC_CHECK_FUNC( iconv_open, [ac_cv_func_iconv_open=yes])
+ if test x"$ac_cv_func_iconv_open" != x"yes"; then
+     AC_CHECK_FUNC( libiconv_open, [ac_cv_func_iconv_open=yes])
+ fi
+ if test x"$ac_cv_func_iconv_open" = x"yes"; then
+     AC_DEFINE(HAVE_ICONV_OPEN, 1, [Define to 1 if you have the "iconv_open" function])
+ fi
+ 
  AC_CHECK_FUNCS(getpgrp tcgetpgrp)
  if test $ac_cv_func_getpgrp = yes; then
      AC_FUNC_GETPGRP