Skip to content

Commit 92d8f00

Browse files
Andreas Herrmanngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0dd79e0 commit 92d8f00

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,8 @@ fi
546546
# git-http-push are not built, and you cannot use http:// and https://
547547
# transports.
548548

549+
if test -z "$NO_CURL"; then
550+
549551
GIT_STASH_FLAGS($CURLDIR)
550552

551553
AC_CHECK_LIB([curl], [curl_global_init],
@@ -554,6 +556,8 @@ AC_CHECK_LIB([curl], [curl_global_init],
554556

555557
GIT_UNSTASH_FLAGS($CURLDIR)
556558

559+
fi
560+
557561
GIT_CONF_SUBST([NO_CURL])
558562

559563
if test -z "$NO_CURL"; then

0 commit comments

Comments
 (0)