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 <aherrmann@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andreas Herrmann committed
Jul 19, 2023 at 16:29 UTC
0dd79e0d49818e964079c6d45f7f06a385bf2704
1 file changed
+4
configure.ac
+4
@@ -581,6 +581,8 @@ fi
581
# Define NO_EXPAT if you do not have expat installed. git-http-push is
582
# not built, and you cannot push using http:// and https:// transports.
583
584
+if test -z "$NO_EXPAT"; then
585
+
586
GIT_STASH_FLAGS($EXPATDIR)
587
588
AC_CHECK_LIB([expat], [XML_ParserCreate],
@@ -589,6 +591,8 @@ AC_CHECK_LIB([expat], [XML_ParserCreate],
591
592
GIT_UNSTASH_FLAGS($EXPATDIR)
593
594
+fi
595
+
596
GIT_CONF_SUBST([NO_EXPAT])
597
598
#