diff options
| author | Andreas Herrmann <aherrmann@suse.de> | 2023-07-19 17:29:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-19 20:07:55 +0300 |
| commit | 0dd79e0d49818e964079c6d45f7f06a385bf2704 (patch) | |
| tree | c3da80489f1d349fda5d295c99c8437862cac71e /configure.ac | |
| parent | fb7d80edcae482f4fa5d4be0227dc3054734e5f3 (diff) | |
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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 4 insertions, 0 deletions
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]) # |