kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Andreas Herrmann 2023-07-19 16:29:58 +02:00 committed by Junio C Hamano
parent 92d8f00a11
commit fb8f7269c2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -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.