Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx> --- This patch only adds NO_ICONV=YesPlease, and it never unsets NO_ICONV. This doesn't matter now because there is no setting NO_ICONV value in Makefile (no architecture/system based detection). configure.ac | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 482c849..8af276c 100644 --- a/configure.ac +++ b/configure.ac @@ -143,9 +143,12 @@ AC_CHECK_LIB([expat], [XML_ParserCreate] AC_SUBST(NO_EXPAT) # # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin). +# Define NO_ICONV if neither libc nor libiconv support iconv. AC_CHECK_LIB([c], [iconv], -[NEEDS_LIBICONV=], -[NEEDS_LIBICONV=YesPlease]) + [NEEDS_LIBICONV=], + AC_CHECK_LIB([iconv], [iconv], + [NEEDS_LIBICONV=YesPlease], + [GIT_CONF_APPEND_LINE([NO_ICONV=YesPlease])])) AC_SUBST(NEEDS_LIBICONV) test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv" # -- 1.4.2 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html