[PATCH 1/3] configure: respect --without-curl flags
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
---
configure.ac | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 66aedb9288..f4742878c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -592,6 +592,9 @@ fi
# git-http-push are not built, and you cannot use http:// and https://
# transports.
+# Respect --without-curl
+if test "x$NO_CURL" != "xYesPlease"; then
+
GIT_STASH_FLAGS($CURLDIR)
AC_CHECK_LIB([curl], [curl_global_init],
@@ -600,8 +603,6 @@ AC_CHECK_LIB([curl], [curl_global_init],
GIT_UNSTASH_FLAGS($CURLDIR)
-GIT_CONF_SUBST([NO_CURL])
-
if test -z "$NO_CURL"; then
AC_CHECK_PROG([CURL_CONFIG], [curl-config],
@@ -622,6 +623,9 @@ fi
fi
+fi
+
+GIT_CONF_SUBST([NO_CURL])
#
# Define NO_EXPAT if you do not have expat installed. git-http-push is
--
2.26.0.rc2.234.g969ad452ca