From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 25 Mar 2014 18:07:51 +0000 (-0700)
Subject: Merge branch 'dm/configure-iconv-locale-charset'
X-Git-Tag: v2.0.0-rc0~66
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2f2db83fb77e8c639f8b8ebeab97d92c492d721c?ds=inline;hp=-c

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

* dm/configure-iconv-locale-charset:
configure.ac: link with -liconv for locale_charset()
---

2f2db83fb77e8c639f8b8ebeab97d92c492d721c
diff --combined configure.ac
index 24ab7383ae,3f5c644afd..b7112542b4
--- a/configure.ac
+++ b/configure.ac
@@@ -890,7 -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])
@@@ -901,6 -901,34 +901,6 @@@ GIT_CHECK_FUNC(strcasestr
  [NO_STRCASESTR=YesPlease])
  GIT_CONF_SUBST([NO_STRCASESTR])
  #
 -# Define NO_FNMATCH if you don't have fnmatch
 -GIT_CHECK_FUNC(fnmatch,
 -[NO_FNMATCH=],
 -[NO_FNMATCH=YesPlease])
 -GIT_CONF_SUBST([NO_FNMATCH])
 -#
 -# Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the
 -# FNM_CASEFOLD GNU extension.
 -AC_CACHE_CHECK([whether the fnmatch function supports the FNMATCH_CASEFOLD GNU extension],
 - [ac_cv_c_excellent_fnmatch], [
 -AC_EGREP_CPP(yippeeyeswehaveit,
 -	AC_LANG_PROGRAM([
 -#include <fnmatch.h>
 -],
 -[#ifdef FNM_CASEFOLD
 -yippeeyeswehaveit
 -#endif
 -]),
 -	[ac_cv_c_excellent_fnmatch=yes],
 -	[ac_cv_c_excellent_fnmatch=no])
 -])
 -if test $ac_cv_c_excellent_fnmatch = yes; then
 -	NO_FNMATCH_CASEFOLD=
 -else
 -	NO_FNMATCH_CASEFOLD=YesPlease
 -fi
 -GIT_CONF_SUBST([NO_FNMATCH_CASEFOLD])
 -#
  # Define NO_MEMMEM if you don't have memmem.
  GIT_CHECK_FUNC(memmem,
  [NO_MEMMEM=],