Re: zsh 4.2.5

[Oliver Kiddle <okiddle@xxxxxxxxxxx>]

Dan Nelson wrote:

> He's probably got libiconv installed and using gcc which defaults to
> having /usr/local/include *before* /usr/include in the search path!! 
> Both sunfreeware.com's version for Solaris 9 and the one bundled with
> Solaris 10 do this.  Remove or rename /usr/local/include/iconv.h.

Okay, so we need to find out if iconv.h comes from libiconv. That's
probably easiest done by checking whether it defines _LIBICONV_H or
_LIBICONV_VERSION using AC_CHECK_DECL. The following patch does that.

If testing this on a suitable Solaris installation (with libiconv and
gcc), note that you'll need LD_LIBRARY_PATH to contain /usr/local/lib.
(otherwise the later tcsetpgrp() test fails to run because it needs to
find the libiconv library). Should I perhaps use a separate ICONV_LIBS
variable?

Oliver

Index: configure.ac
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.ac,v
retrieving revision 1.31
diff -u -r1.31 configure.ac
--- configure.ac	4 Apr 2005 09:58:49 -0000	1.31
+++ configure.ac	7 Apr 2005 16:01:02 -0000
@@ -743,6 +743,10 @@
     if test "x$ac_found_iconv" != "xno"; then
       LIBS="-liconv $LIBS"
     fi
+  else
+    AC_CHECK_DECL(_libiconv_version,
+      [ AC_CHECK_LIB(iconv, libiconv, LIBS="-liconv $LIBS") ],,
+      [ #include <iconv.h> ])
   fi
 fi
 if test "x$ac_found_iconv" = xyes; then