From: Marat Radchenko Date: Tue, 29 Apr 2014 09:12:01 GMT Subject: [PATCH 07/12] MINGW: config.mak.uname: reorganize MINGW settings Message-ID: <1398762726-22825-8-git-send-email-marat@slonopotamus.org> In-Reply-To: <1398762726-22825-1-git-send-email-marat@slonopotamus.org> HAVE_LIBCHARSET_H and NO_R_TO_GCC_LINKER are not specific to msysGit, they're general MinGW settings. Logic behind HAVE_LIBCHARSET_H: if user is on MinGW and has iconv, we expect him to have libcharset.h. If user doesn't have iconv, he has to explicitly say so via NO_ICONV=1. Signed-off-by: Marat Radchenko --- config.mak.uname | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 50c1114..b68a7d1 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -516,11 +516,11 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) prefix = INSTALL = /bin/install EXTLIBS += /mingw/lib/libz.a - NO_R_TO_GCC_LINKER = YesPlease INTERNAL_QSORT = YesPlease - HAVE_LIBCHARSET_H = YesPlease NO_GETTEXT = YesPlease endif + HAVE_LIBCHARSET_H = YesPlease + NO_R_TO_GCC_LINKER = YesPlease endif ifeq ($(uname_S),QNX) COMPAT_CFLAGS += -DSA_RESTART=0 -- 1.9.1