diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-21 14:57:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-21 14:57:14 -0800 |
| commit | ef55bd78e7a524e8fd7513ffa5fb6253667369cf (patch) | |
| tree | ae83bb99ae90d9ed0c014b512ab98469392e4d4c /Makefile | |
| parent | 6f61eb201799ee83c3a82f1f097c18b3854c0c03 (diff) | |
| parent | b5225286b226759262c0637058528af03226fba6 (diff) | |
| download | git-ef55bd78e7a524e8fd7513ffa5fb6253667369cf.tar.gz git-ef55bd78e7a524e8fd7513ffa5fb6253667369cf.tar.xz | |
Merge branch 'dp/i18n-libcharset' into maint
* dp/i18n-libcharset:
Makefile: introduce CHARSET_LIB to link with -lcharset
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -53,6 +53,10 @@ all:: # FreeBSD can use either, but MinGW and some others need to use # libcharset.h's locale_charset() instead. # +# Define CHARSET_LIB to you need to link with library other than -liconv to +# use locale_charset() function. On some platforms this needs to set to +# -lcharset +# # Define LIBC_CONTAINS_LIBINTL if your gettext implementation doesn't # need -lintl when linking. # @@ -1695,6 +1699,7 @@ endif ifdef HAVE_LIBCHARSET_H BASIC_CFLAGS += -DHAVE_LIBCHARSET_H + EXTLIBS += $(CHARSET_LIB) endif ifdef HAVE_DEV_TTY |