From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jan 2012 00:31:09 +0000 (-0600)
Subject: i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT
X-Git-Tag: v1.7.10-rc0~124^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60f40791f9f7b671b300b752a9beebc7737a5242;p=git.git

i18n: Do not force USE_GETTEXT_SCHEME=fallthrough on NO_GETTEXT

It should merely be the default used when the builder does not say
anything about USE_GETTEXT_SCHEME.

Even with NO_GETTEXT, USE_GETTEXT_SCHEME=gnu may be a way to avoid
possibly slower emulation in our shell scripts.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index a4a33d435..634b2ece0 100644
--- a/Makefile
+++ b/Makefile
@@ -1515,7 +1515,7 @@ ifdef GETTEXT_POISON
 endif
 ifdef NO_GETTEXT
 	BASIC_CFLAGS += -DNO_GETTEXT
-	USE_GETTEXT_SCHEME = fallthrough
+	USE_GETTEXT_SCHEME ?= fallthrough
 endif
 ifdef NO_STRCASESTR
 	COMPAT_CFLAGS += -DNO_STRCASESTR