mirror of
https://github.com/git/git.git
synced 2024-05-05 03:36:31 +02:00
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>
This commit is contained in:
parent
fb7d80edca
commit
0dd79e0d49
|
@ -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])
|
||||
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue