From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Oct 2016 21:03:48 +0000 (-0700)
Subject: Merge branch 'dp/autoconf-curl-ssl'
X-Git-Tag: v2.11.0-rc0~70
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/667c6d591e2a92dd2e3d8cd503ead492c0f34334?hp=-c

Merge branch 'dp/autoconf-curl-ssl'

The ./configure script generated from configure.ac was taught how
to detect support of SSL by libcurl better.

* dp/autoconf-curl-ssl:
./configure.ac: detect SSL in libcurl using curl-config
---

667c6d591e2a92dd2e3d8cd503ead492c0f34334
diff --combined configure.ac
index aa9c91d20d,5e9ba59d59..3a43b7a5b3
--- a/configure.ac
+++ b/configure.ac
@@@ -528,16 -528,6 +528,6 @@@ AC_CHECK_LIB([curl], [curl_global_init]
  [NO_CURL=],
  [NO_CURL=YesPlease])
  
- if test -z "${NO_CURL}" && test -z "${NO_OPENSSL}"; then
- 
- AC_CHECK_LIB([curl], [Curl_ssl_init],
- [NEEDS_SSL_WITH_CURL=YesPlease],
- [NEEDS_SSL_WITH_CURL=])
- 
- GIT_CONF_SUBST([NEEDS_SSL_WITH_CURL])
- 
- fi
- 
  GIT_UNSTASH_FLAGS($CURLDIR)
  
  GIT_CONF_SUBST([NO_CURL])
@@@ -550,6 -540,17 +540,17 @@@ AC_CHECK_PROG([CURL_CONFIG], [curl-conf
  
  if test $CURL_CONFIG != no; then
      GIT_CONF_SUBST([CURL_CONFIG])
+     if test -z "${NO_OPENSSL}"; then
+       AC_MSG_CHECKING([if Curl supports SSL])
+       if test $(curl-config --features|grep SSL) = SSL; then
+          NEEDS_SSL_WITH_CURL=YesPlease
+          AC_MSG_RESULT([yes])
+       else
+          NEEDS_SSL_WITH_CURL=
+          AC_MSG_RESULT([no])
+       fi
+       GIT_CONF_SUBST([NEEDS_SSL_WITH_CURL])
+     fi
  fi
  
  fi
@@@ -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;
  ]])])