@matheusbsbs / matheus-bagliano / commits / fe4aafba28
Fork 0

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 <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Wincent Colaiuta committed Dec 6, 2007 at 20:07 UTC fe4aafba28036237c594e1324f83a388d88ab9db
1 file changed +3 -1
Makefile
+3 -1
@@ -406,7 +406,9 @@ endif
406 ifeq ($(uname_S),Darwin)
407 NEEDS_SSL_WITH_CRYPTO = YesPlease
408 NEEDS_LIBICONV = YesPlease
409 - OLD_ICONV = UnfortunatelyYes
409 + ifneq ($(shell expr "$(uname_R)" : '9\.'),2)
410 + OLD_ICONV = UnfortunatelyYes
411 + endif
412 NO_STRLCPY = YesPlease
413 NO_MEMMEM = YesPlease
414 endif