]> git.ipfire.org Git - thirdparty/git.git/commitdiff
configure.ac: don't overwrite NO_EXPAT option
authorAndreas Herrmann <aherrmann@suse.de>
Wed, 19 Jul 2023 14:29:54 +0000 (16:29 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Jul 2023 17:07:55 +0000 (10:07 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
configure.ac

index 38ff86678a03a96dffa57507364a6f706ddb44d0..62cc8197f88552f570c77fd9e1bafd9ed88132e0 100644 (file)
@@ -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])
 
 #