diff options
| author | Andreas Herrmann <aherrmann@suse.de> | 2023-07-19 16:29:58 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-07-19 19:07:55 +0200 |
| commit | fb8f7269c2fc69ada6238bc766168adbfd15a369 (patch) | |
| tree | 3a478214120fb5d6145e8b67f0926142df47bf51 /configure.ac | |
| parent | configure.ac: don't overwrite NO_CURL option (diff) | |
| download | git-fb8f7269c2fc69ada6238bc766168adbfd15a369.tar.xz git-fb8f7269c2fc69ada6238bc766168adbfd15a369.zip | |
configure.ac: always save NO_ICONV to config.status
In case 'configure --with-iconv=no' is used, NO_ICONV is not saved to
config.status and thus git is built with iconv support.
Always save NO_ICONV to config.status to honor what user selected
during configure step.
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 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e85e215f14..276593cd9d 100644 --- a/configure.ac +++ b/configure.ac @@ -644,7 +644,6 @@ LIBS="$old_LIBS" GIT_UNSTASH_FLAGS($ICONVDIR) GIT_CONF_SUBST([NEEDS_LIBICONV]) -GIT_CONF_SUBST([NO_ICONV]) if test -n "$NO_ICONV"; then NEEDS_LIBICONV= @@ -652,6 +651,8 @@ fi fi +GIT_CONF_SUBST([NO_ICONV]) + # # Define NO_DEFLATE_BOUND if deflateBound is missing from zlib. |