Merge branch 'js/regexec-buf' into maint

A follow-up to an already graduated topic.

* js/regexec-buf:
  configure.ac: improve description of NO_REGEX test
This commit is contained in:
Junio C Hamano 2016-10-28 09:01:12 -07:00
commit 68eb7b1b52

View File

@ -835,9 +835,10 @@ AC_CHECK_TYPE([struct addrinfo],[
]) ])
GIT_CONF_SUBST([NO_IPV6]) GIT_CONF_SUBST([NO_IPV6])
# #
# Define NO_REGEX if you have no or inferior regex support in your C library. # Define NO_REGEX if your C library lacks regex support with REG_STARTEND
AC_CACHE_CHECK([whether the platform regex can handle null bytes], # feature.
[ac_cv_c_excellent_regex], [ AC_CACHE_CHECK([whether the platform regex supports REG_STARTEND],
[ac_cv_c_regex_with_reg_startend], [
AC_EGREP_CPP(yippeeyeswehaveit, AC_EGREP_CPP(yippeeyeswehaveit,
AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
#include <regex.h> #include <regex.h>
@ -846,10 +847,10 @@ AC_EGREP_CPP(yippeeyeswehaveit,
yippeeyeswehaveit yippeeyeswehaveit
#endif #endif
]), ]),
[ac_cv_c_excellent_regex=yes], [ac_cv_c_regex_with_reg_startend=yes],
[ac_cv_c_excellent_regex=no]) [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= NO_REGEX=
else else
NO_REGEX=YesPlease NO_REGEX=YesPlease