Merge branch 'nd/i18n-2.8.0'

diff --git a/config.mak.uname b/config.mak.uname
index 4b2e1b807fc4e6f4467f0da891afe9aa8dad6310..4c68e078e7ac4a9584b2782f278b00fcbe594505 100644 (file)
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -102,6 +102,9 @@ ifeq ($(uname_S),Darwin)
        ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2)
                NO_STRLCPY = YesPlease
        endif
+       ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -eq 10 && echo 1),1)
+               CC = clang
+       endif
        ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 11 && echo 1),1)
                HAVE_GETDELIM = YesPlease
        endif
@@ -560,7 +563,8 @@ else
                NO_R_TO_GCC_LINKER = YesPlease
                INTERNAL_QSORT = YesPlease
                HAVE_LIBCHARSET_H = YesPlease
-               NO_GETTEXT = YesPlease
+               NO_GETTEXT =
+               USE_GETTEXT_SCHEME = fallthrough
                USE_LIBPCRE= YesPlease
                NO_CURL =
                USE_NED_ALLOCATOR = YesPlease