diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:43 -0700 |
| commit | 3c84c38dac9c938e69aab4fa973a8dc944200d98 (patch) | |
| tree | ad72fadd022739a51df00c511beb5ae00c0d36fd | |
| parent | a1eaf8655dcf81576f1cc6becdc63ae0de7c84d5 (diff) | |
| parent | 96658060d7d4317fa5e6f9309d058bdc4fd129db (diff) | |
| download | git-3c84c38dac9c938e69aab4fa973a8dc944200d98.tar.gz git-3c84c38dac9c938e69aab4fa973a8dc944200d98.tar.xz | |
Merge branch 'es/configure-getdelim'
Auto-detect availability of getdelim() that helps optimized version
of strbuf_getwholeline().
* es/configure-getdelim:
configure: add getdelim() check
config.mak.uname: Darwin: define HAVE_GETDELIM for modern OS X releases
| -rw-r--r-- | config.mak.uname | 3 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/config.mak.uname b/config.mak.uname index d26665fa5..943c43965 100644 --- 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]*\)\.'`" -ge 11 && echo 1),1) + HAVE_GETDELIM = YesPlease + endif NO_MEMMEM = YesPlease USE_ST_TIMESPEC = YesPlease HAVE_DEV_TTY = YesPlease diff --git a/configure.ac b/configure.ac index bbdde85c3..14012fad7 100644 --- a/configure.ac +++ b/configure.ac @@ -1041,6 +1041,12 @@ GIT_CHECK_FUNC(initgroups, [NO_INITGROUPS=YesPlease]) GIT_CONF_SUBST([NO_INITGROUPS]) # +# Define HAVE_GETDELIM if you have getdelim in the C library. +GIT_CHECK_FUNC(getdelim, +[HAVE_GETDELIM=YesPlease], +[HAVE_GETDELIM=]) +GIT_CONF_SUBST([HAVE_GETDELIM]) +# # # Define NO_MMAP if you want to avoid mmap. # |