summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-17 13:25:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-17 13:25:21 -0700
commit9424bf27079a1262e42a2330283f7ab6c805267a (patch)
tree61486b7b2c8d1e4ebd55418e5375b45e32e136f2
parentMerge branch 'jk/ref-symlink-loop' (diff)
parentconfigure.ac: improve description of NO_REGEX test (diff)
downloadtgif-9424bf27079a1262e42a2330283f7ab6c805267a.tar.xz
Merge branch 'js/regexec-buf'
* js/regexec-buf: configure.ac: improve description of NO_REGEX test
-rw-r--r--configure.ac13
1 files changed, 7 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 3a43b7a5b3..0b15f04b10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -836,9 +836,10 @@ AC_CHECK_TYPE([struct addrinfo],[
])
GIT_CONF_SUBST([NO_IPV6])
#
-# Define NO_REGEX if you have no or inferior regex support in your C library.
-AC_CACHE_CHECK([whether the platform regex can handle null bytes],
- [ac_cv_c_excellent_regex], [
+# Define NO_REGEX if your C library lacks regex support with REG_STARTEND
+# feature.
+AC_CACHE_CHECK([whether the platform regex supports REG_STARTEND],
+ [ac_cv_c_regex_with_reg_startend], [
AC_EGREP_CPP(yippeeyeswehaveit,
AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
#include <regex.h>
@@ -847,10 +848,10 @@ AC_EGREP_CPP(yippeeyeswehaveit,
yippeeyeswehaveit
#endif
]),
- [ac_cv_c_excellent_regex=yes],
- [ac_cv_c_excellent_regex=no])
+ [ac_cv_c_regex_with_reg_startend=yes],
+ [ac_cv_c_regex_with_reg_startend=no])
])
-if test $ac_cv_c_excellent_regex = yes; then
+if test $ac_cv_c_regex_with_reg_startend = yes; then
NO_REGEX=
else
NO_REGEX=YesPlease