Skip to content

Commit 0dd79e0

Browse files
Andreas Herrmanngitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fb7d80e commit 0dd79e0

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

configure.ac

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,8 @@ fi
581581
# Define NO_EXPAT if you do not have expat installed. git-http-push is
582582
# not built, and you cannot push using http:// and https:// transports.
583583

584+
if test -z "$NO_EXPAT"; then
585+
584586
GIT_STASH_FLAGS($EXPATDIR)
585587

586588
AC_CHECK_LIB([expat], [XML_ParserCreate],
@@ -589,6 +591,8 @@ AC_CHECK_LIB([expat], [XML_ParserCreate],
589591

590592
GIT_UNSTASH_FLAGS($EXPATDIR)
591593

594+
fi
595+
592596
GIT_CONF_SUBST([NO_EXPAT])
593597

594598
#

0 commit comments

Comments
 (0)