From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Oct 2016 16:01:12 +0000 (-0700)
Subject: Merge branch 'js/regexec-buf' into maint
X-Git-Tag: v2.10.2~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/68eb7b1b5222d5c9db2a9d5047bffe3fb65280f8?hp=-c

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
---

68eb7b1b5222d5c9db2a9d5047bffe3fb65280f8
diff --combined configure.ac
index aa9c91d20d,a7287aa985..7f39fd029b
--- a/configure.ac
+++ b/configure.ac
@@@ -835,9 -835,10 +835,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>
@@@ -846,10 -847,10 +847,10 @@@
  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
@@@ -1108,19 -1109,14 +1109,19 @@@ GIT_CONF_SUBST([HAVE_BSD_SYSCTL]
  AC_DEFUN([PTHREADTEST_SRC], [
  AC_LANG_PROGRAM([[
  #include <pthread.h>
 +static void *noop(void *ignore) { return ignore; }
  ]], [[
  	pthread_mutex_t test_mutex;
  	pthread_key_t test_key;
 +	pthread_t th;
  	int retcode = 0;
 +	void *ret = (void *)0;
  	retcode |= pthread_key_create(&test_key, (void *)0);
  	retcode |= pthread_mutex_init(&test_mutex,(void *)0);
  	retcode |= pthread_mutex_lock(&test_mutex);
  	retcode |= pthread_mutex_unlock(&test_mutex);
 +	retcode |= pthread_create(&th, ret, noop, ret);
 +	retcode |= pthread_join(th, &ret);
  	return retcode;
  ]])])