Merge "two fixes for fast-import's 'ls' command" from Jonathan

[git.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8471f5c5903292178a5741be62fa566ee0a9e0b2..8bb0f44b489e0e963c70e88d04e5878dd78012d5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -840,6 +840,16 @@ AC_CHECK_HEADER([libcharset.h],
 [HAVE_LIBCHARSET_H=YesPlease],
 [HAVE_LIBCHARSET_H=])
 AC_SUBST(HAVE_LIBCHARSET_H)
+# Define CHARSET_LIB if libiconv does not export the locale_charset symbol
+# and libcharset does
+CHARSET_LIB=
+AC_CHECK_LIB([iconv], [locale_charset],
+       [],
+       [AC_CHECK_LIB([charset], [locale_charset],
+                     [CHARSET_LIB=-lcharset])
+       ]
+)
+AC_SUBST(CHARSET_LIB)
 #
 # Define NO_STRCASESTR if you don't have strcasestr.
 GIT_CHECK_FUNC(strcasestr,