X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=8bb0f44b489e0e963c70e88d04e5878dd78012d5;hb=bdf26fcbeabec0c2a785e5b14b9f3b4079cab0ea;hp=8471f5c5903292178a5741be62fa566ee0a9e0b2;hpb=a8356d43e3602fb65a9ae57a5cf1ca98a75f5cc3;p=git.git

diff --git a/configure.ac b/configure.ac
index 8471f5c59..8bb0f44b4 100644
--- 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,