Browse Source

./configure.ac: detect SSL in libcurl using curl-config

The API of libcurl does not mention Curl_ssl_init() and when curl is
built with -flto, the Curl_ssl_init symbol is not exported.

https://curl.haxx.se/libcurl/using/ suggests calling

  curl-config --feature | grep SSL

to see, if the installed curl has SSL support.  Another approach
would be calling curl_version_info and checking the returned struct.

This patch removes the check for the Curl_ssl_init exported symbol
from libcurl and uses curl-config to detect SSL support in libcurl.

Signed-off-by: Дилян Палаузов <git-dpa@aegee.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Дилян Палаузов 9 years ago committed by Junio C Hamano
parent
commit
924b7eb1c9
  1. 21
      configure.ac

21
configure.ac

@ -528,16 +528,6 @@ AC_CHECK_LIB([curl], [curl_global_init], @@ -528,16 +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 @@ AC_CHECK_PROG([CURL_CONFIG], [curl-config], @@ -550,6 +540,17 @@ AC_CHECK_PROG([CURL_CONFIG], [curl-config],

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

Loading…
Cancel
Save