From: Andreas Herrmann <aherrmann@suse.de>
To: git@vger.kernel.org
Cc: Andreas Herrmann <aherrmann@suse.de>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 1/3] configure.ac: don't overwrite NO_EXPAT option
Date: Wed, 19 Jul 2023 16:29:54 +0200 [thread overview]
Message-ID: <20230719145211.17854-4-aherrmann@suse.de> (raw)
In-Reply-To: <20230719145211.17854-2-aherrmann@suse.de>
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 <aherrmann@suse.de>
---
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])
#
--
2.41.0
next prev parent reply other threads:[~2023-07-19 14:52 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 14:29 [PATCH 0/3] configure.ac: misc configure fixes Andreas Herrmann
2023-07-19 14:29 ` Andreas Herrmann [this message]
2023-07-19 14:29 ` [PATCH 2/3] configure.ac: don't overwrite NO_CURL option Andreas Herrmann
2023-07-19 14:29 ` [PATCH 3/3] configure.ac: always save NO_ICONV to config.status Andreas Herrmann
2023-07-19 21:35 ` [PATCH 0/3] configure.ac: misc configure fixes Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230719145211.17854-4-aherrmann@suse.de \
--to=aherrmann@suse.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).