From 0dd79e0d49818e964079c6d45f7f06a385bf2704 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 19 Jul 2023 16:29:54 +0200 Subject: [PATCH 1/3] configure.ac: don't overwrite NO_EXPAT option Even if 'configure --with-expat=no' was run, expat support is used, because library detection overwrites it. Avoid this overwrite. Configure should obey what the user has specified. Signed-off-by: Andreas Herrmann Signed-off-by: Junio C Hamano --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 38ff86678a..62cc8197f8 100644 --- a/configure.ac +++ b/configure.ac @@ -581,6 +581,8 @@ fi # Define NO_EXPAT if you do not have expat installed. git-http-push is # not built, and you cannot push using http:// and https:// transports. +if test -z "$NO_EXPAT"; then + GIT_STASH_FLAGS($EXPATDIR) AC_CHECK_LIB([expat], [XML_ParserCreate], @@ -589,6 +591,8 @@ AC_CHECK_LIB([expat], [XML_ParserCreate], GIT_UNSTASH_FLAGS($EXPATDIR) +fi + GIT_CONF_SUBST([NO_EXPAT]) # From 92d8f00a1118b47fed5806b0830cdccf810500d3 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 19 Jul 2023 16:29:56 +0200 Subject: [PATCH 2/3] 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 Signed-off-by: Junio C Hamano --- configure.ac | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index 62cc8197f8..e85e215f14 100644 --- a/configure.ac +++ b/configure.ac @@ -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 From fb8f7269c2fc69ada6238bc766168adbfd15a369 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 19 Jul 2023 16:29:58 +0200 Subject: [PATCH 3/3] configure.ac: always save NO_ICONV to config.status In case 'configure --with-iconv=no' is used, NO_ICONV is not saved to config.status and thus git is built with iconv support. Always save NO_ICONV to config.status to honor what user selected during configure step. Signed-off-by: Andreas Herrmann Signed-off-by: Junio C Hamano --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e85e215f14..276593cd9d 100644 --- a/configure.ac +++ b/configure.ac @@ -644,7 +644,6 @@ LIBS="$old_LIBS" GIT_UNSTASH_FLAGS($ICONVDIR) GIT_CONF_SUBST([NEEDS_LIBICONV]) -GIT_CONF_SUBST([NO_ICONV]) if test -n "$NO_ICONV"; then NEEDS_LIBICONV= @@ -652,6 +651,8 @@ fi fi +GIT_CONF_SUBST([NO_ICONV]) + # # Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.