From: Johannes Schindelin Date: Sun, 14 Apr 2019 21:19:29 +0000 (-0700) Subject: macOS: make sure that gettext is found X-Git-Tag: v2.22.0-rc0~36^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/92a1377a2ac69b2975f268c1dda079333f8d9df1?ds=sidebyside;hp=aeb582a98374c094361cba1bd756dc6307432c42 macOS: make sure that gettext is found Due to reasons (some XCode versions seem to include gettext, some don't?), Homebrew does not expose the libraries and headers in /usr/local/ by default anymore. Let's help find them again. Note: for some reason, this is a change of behavior caused by the upgrade to Mojave, identified in our Azure Pipeline; it seems that Homebrew used to add the /usr/local/ directories to the include and link search path before, but now it no longer does. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/config.mak.uname b/config.mak.uname index 2011bac6d5..78f9d0ba5e 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -114,6 +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