aboutsummaryrefslogtreecommitdiff
path: root/config.mak.in
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-19 16:06:41 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-19 16:06:41 -0800
commit2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40 (patch)
tree3753154d3da34ff50e82a667a75ad56437d4d12f /config.mak.in
parent85878dd0c929dde5d91411b57ef9f2d696cbc7d8 (diff)
parent5e9637c629702e3d41ad01d95956d1835d7338e0 (diff)
downloadgit-2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40.tar.gz
git-2dccad3c6f9df2b1eea7eb5617e2748a7f2daa40.tar.xz
Merge branch 'ab/enable-i18n'
* ab/enable-i18n: i18n: add infrastructure for translating Git with gettext Conflicts: Makefile
Diffstat (limited to 'config.mak.in')
-rw-r--r--config.mak.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/config.mak.in b/config.mak.in
index ab371012a..10698c829 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -35,6 +35,9 @@ NO_CURL=@NO_CURL@
NO_EXPAT=@NO_EXPAT@
NO_LIBGEN_H=@NO_LIBGEN_H@
HAVE_PATHS_H=@HAVE_PATHS_H@
+HAVE_LIBCHARSET_H=@HAVE_LIBCHARSET_H@
+NO_GETTEXT=@NO_GETTEXT@
+LIBC_CONTAINS_LIBINTL=@LIBC_CONTAINS_LIBINTL@
NEEDS_LIBICONV=@NEEDS_LIBICONV@
NEEDS_SOCKET=@NEEDS_SOCKET@
NEEDS_RESOLV=@NEEDS_RESOLV@