From: Wincent Colaiuta Date: Thu, 6 Dec 2007 19:07:03 +0000 (+0100) Subject: Silence iconv warnings on Leopard X-Git-Tag: v1.5.4-rc0~64 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=fe4aafba28036237c594e1324f83a388d88ab9db;p=git.git Silence iconv warnings on Leopard Apple ships a newer version of iconv with Leopard (Mac OS X 10.5/Darwin 9). Ensure that OLD_ICONV is not set on any version of Darwin in the 9.x series; this should be good for at least a couple of years, when Darwin 10 comes out and we can invert the sense of the test to specifically check for Darwin 7 or 8. A more sophisticated and robust check is possible for those who use autoconf, but not everybody does that. Signed-off-by: Wincent Colaiuta Signed-off-by: Junio C Hamano --- diff --git a/Makefile b/Makefile index 999391e10..4dda3405b 100644 --- a/Makefile +++ b/Makefile @@ -406,7 +406,9 @@ endif ifeq ($(uname_S),Darwin) NEEDS_SSL_WITH_CRYPTO = YesPlease NEEDS_LIBICONV = YesPlease - OLD_ICONV = UnfortunatelyYes + ifneq ($(shell expr "$(uname_R)" : '9\.'),2) + OLD_ICONV = UnfortunatelyYes + endif NO_STRLCPY = YesPlease NO_MEMMEM = YesPlease endif