From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Apr 2019 07:41:25 +0000 (+0900)
Subject: Merge branch 'js/macos-gettext-build'
X-Git-Tag: v2.22.0-rc0~36
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aa8c8d914e4ae709e4fd025f359594f62653d9e5?hp=-c

Merge branch 'js/macos-gettext-build'

Build with gettext breaks on recent macOS w/ Homebrew when
/usr/local/bin is not on PATH, which has been corrected.

* js/macos-gettext-build:
macOS: make sure that gettext is found
---

aa8c8d914e4ae709e4fd025f359594f62653d9e5
diff --combined config.mak.uname
index 41e85fab1c,78f9d0ba5e..3605fead53
--- a/config.mak.uname
+++ b/config.mak.uname
@@@ -114,6 -114,8 +114,8 @@@ ifeq ($(uname_S),Darwin
  	HAVE_BSD_SYSCTL = YesPlease
  	FREAD_READS_DIRECTORIES = UnfortunatelyYes
  	HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
+ 	BASIC_CFLAGS += -I/usr/local/include
+ 	BASIC_LDFLAGS += -L/usr/local/lib
  endif
  ifeq ($(uname_S),SunOS)
  	NEEDS_SOCKET = YesPlease
@@@ -393,7 -395,6 +395,7 @@@ ifeq ($(uname_S),Windows
  	BASIC_CFLAGS = -nologo -I. -I../zlib -Icompat/vcbuild -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
  	COMPAT_OBJS = compat/msvc.o compat/winansi.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
 +		compat/win32/trace2_win32_process_info.o \
  		compat/win32/dirent.o
  	COMPAT_CFLAGS = -D__USE_MINGW_ACCESS -DNOGDI -DHAVE_STRING_H -Icompat -Icompat/regex -Icompat/win32 -DSTRIP_EXTENSION=\".exe\"
  	BASIC_LDFLAGS = -IGNORE:4217 -IGNORE:4049 -NOLOGO -SUBSYSTEM:CONSOLE
@@@ -530,6 -531,7 +532,6 @@@ ifneq (,$(findstring MINGW,$(uname_S))
  	NO_STRTOUMAX = YesPlease
  	NO_MKDTEMP = YesPlease
  	NO_SVN_TESTS = YesPlease
 -	NO_PERL_MAKEMAKER = YesPlease
  	RUNTIME_PREFIX = YesPlease
  	HAVE_WPGMPTR = YesWeDo
  	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
@@@ -546,7 -548,6 +548,7 @@@
  	COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
  	COMPAT_OBJS += compat/mingw.o compat/winansi.o \
 +		compat/win32/trace2_win32_process_info.o \
  		compat/win32/path-utils.o \
  		compat/win32/pthread.o compat/win32/syslog.o \
  		compat/win32/dirent.o