On Thu, Dec 20, 2012 at 12:55:07PM +0100, Fabian Groffen wrote: > On Solaris/OpenIndiana there is a libidn, and the headers are in > /usr/include/idn but they aren't exactly working like GNU libidn, it > seems. So check for the existence of the headers, before assuming they > are there (see the code, e.g. main.c, mutt_idna.h).
Does this mean that on Solaris, the code (with or without your patch) is not using libidn? Do we need additional code to use IDN on Solaris? > diff --git a/configure.ac b/configure.ac > --- a/configure.ac > +++ b/configure.ac > @@ -1184,13 +1184,20 @@ if test "x$with_idn" != "xno"; then > AC_MSG_ERROR([IDN requested but iconv is disabled or unavailable]) > fi > else > - AC_SEARCH_LIBS([stringprep_check_version], [idn], [ > - AC_DEFINE([HAVE_LIBIDN], 1, [Define to 1 if you have the `idn' > library]) > - MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_idna.o" > - ]) > - AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z) > - AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z) > - AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale) > + gnuidnhdrs=yes > + AC_CHECK_HEADERS([idna.h stringprep.h], , [gnuidnhdrs=no]) > + # Solaris has idn/{idna,stringprep}.h and a libidn, but that isn't > + # exactly working like the GNU one, so don't falsively assume idna.h > + # and stringprep.h are there and working fine when we find a libidn "Falsively" is not an English word. Please change it to "falsely" (or "incorrectly" might even be better). :) > + if test "x$gnuidnhdrs" != "xno"; then > + AC_SEARCH_LIBS([stringprep_check_version], [idn], [ > + AC_DEFINE([HAVE_LIBIDN], 1, [Define to 1 if you have the `idn' > library]) > + MUTT_LIB_OBJECTS="$MUTT_LIB_OBJECTS mutt_idna.o" > + ]) The indentation here is inconsistent. Some lines use tabs, some only spaces. > + AC_CHECK_FUNCS(idna_to_unicode_utf8_from_utf8 idna_to_unicode_8z8z) > + AC_CHECK_FUNCS(idna_to_ascii_from_utf8 idna_to_ascii_8z) > + AC_CHECK_FUNCS(idna_to_ascii_lz idna_to_ascii_from_locale) > + fi > fi > fi > -- Derek D. Martin http://www.pizzashack.org/ GPG Key ID: 0xDFBEAD02 -=-=-=-=- This message is posted from an invalid address. Replying to it will result in undeliverable mail due to spam prevention. Sorry for the inconvenience.
pgpevajRfsFjF.pgp
Description: PGP signature