diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-14 20:57:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-14 20:57:18 (GMT) |
| commit | 15c540fde9a72445c3ccfb6d81ce94ccf70b0016 (patch) | |
| tree | 0f36ca58e4b721f36cdbc443cef69b7441e765fa /Makefile | |
| parent | d31f3785dcc10459540e2e185b6e25363f719256 (diff) | |
| parent | b5225286b226759262c0637058528af03226fba6 (diff) | |
| download | git-15c540fde9a72445c3ccfb6d81ce94ccf70b0016.zip git-15c540fde9a72445c3ccfb6d81ce94ccf70b0016.tar.gz git-15c540fde9a72445c3ccfb6d81ce94ccf70b0016.tar.bz2 | |
Merge branch 'dp/i18n-libcharset'
* 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
@@ -56,6 +56,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. # @@ -1701,6 +1705,7 @@ endif ifdef HAVE_LIBCHARSET_H BASIC_CFLAGS += -DHAVE_LIBCHARSET_H + EXTLIBS += $(CHARSET_LIB) endif ifdef HAVE_DEV_TTY |