mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
configure.ac: don't overwrite NO_CURL option
Even if 'configure --with-curl=no' was run, curl support is used, because library detection overwrites it. Avoid this overwrite. Configure should obey what the user has specified. Signed-off-by: Andreas Herrmann <aherrmann@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0dd79e0d49
commit
92d8f00a11
@ -546,6 +546,8 @@ fi
|
||||
# git-http-push are not built, and you cannot use http:// and https://
|
||||
# transports.
|
||||
|
||||
if test -z "$NO_CURL"; then
|
||||
|
||||
GIT_STASH_FLAGS($CURLDIR)
|
||||
|
||||
AC_CHECK_LIB([curl], [curl_global_init],
|
||||
@ -554,6 +556,8 @@ AC_CHECK_LIB([curl], [curl_global_init],
|
||||
|
||||
GIT_UNSTASH_FLAGS($CURLDIR)
|
||||
|
||||
fi
|
||||
|
||||
GIT_CONF_SUBST([NO_CURL])
|
||||
|
||||
if test -z "$NO_CURL"; then
|
||||
|
Loading…
Reference in New Issue
Block a user