Merge branch 'dm/configure-iconv-locale-charset'

diff --git a/configure.ac b/configure.ac
index 24ab7383aecf36e010f838d04b671903d1d8a79f..b7112542b4b62fbbf0235c923f75803edc149e5c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -890,7 +890,7 @@ GIT_CONF_SUBST([HAVE_STRINGS_H])
 # and libcharset does
 CHARSET_LIB=
 AC_CHECK_LIB([iconv], [locale_charset],
-       [],
+       [CHARSET_LIB=-liconv],
        [AC_CHECK_LIB([charset], [locale_charset],
                      [CHARSET_LIB=-lcharset])])
 GIT_CONF_SUBST([CHARSET_LIB])