X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.ac;h=24190de616eae048fbd24839259fc8f160c52d21;hb=c7707a4354f36c59f3310d4edfb18377c064220e;hp=630dbdd19d74fc6ffab529d8d5854043a8f18fd2;hpb=1dcfa8de7c2f630081c9d39ce46f150bbb0af5cb;p=git.git

diff --git a/configure.ac b/configure.ac
index 630dbdd19..24190de61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -836,6 +836,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,