summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-02-11 13:42:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-11 13:42:00 -0800
commitb19aab58f1bc44e9a6715f26ba32b8c9cda3b1fa (patch)
tree9d635234f5f32ffcb4524dcdeb0373c4476f2427 /Makefile
parentMerge branch 'bc/http-fallback-to-password-after-krb-fails' (diff)
parentgettext.h: add parentheses around N_ expansion if supported (diff)
downloadtgif-b19aab58f1bc44e9a6715f26ba32b8c9cda3b1fa.tar.xz
Merge branch 'km/gettext-n'
* km/gettext-n: gettext.h: add parentheses around N_ expansion if supported
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 17 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c44eb3a851..e8ce649ca1 100644
--- a/Makefile
+++ b/Makefile
@@ -348,6 +348,15 @@ all::
#
# Define NO_HMAC_CTX_CLEANUP if your OpenSSL is version 0.9.6b or earlier to
# cleanup the HMAC context with the older HMAC_cleanup function.
+#
+# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
+# compiles the following initialization:
+#
+# static const char s[] = ("FOO");
+#
+# and define it to "no" if you need to remove the parentheses () around the
+# constant. The default is "auto", which means to use parentheses if your
+# compiler is detected to support it.
GIT-VERSION-FILE: FORCE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -955,6 +964,14 @@ ifneq (,$(SOCKLEN_T))
BASIC_CFLAGS += -Dsocklen_t=$(SOCKLEN_T)
endif
+ifeq (yes,$(USE_PARENS_AROUND_GETTEXT_N))
+ BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=1
+else
+ifeq (no,$(USE_PARENS_AROUND_GETTEXT_N))
+ BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
+endif
+endif
+
ifeq ($(uname_S),Darwin)
ifndef NO_FINK
ifeq ($(shell test -d /sw/lib && echo y),y)