Skip to content

Commit fb8f726

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

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,14 +644,15 @@ LIBS="$old_LIBS"
644644
GIT_UNSTASH_FLAGS($ICONVDIR)
645645

646646
GIT_CONF_SUBST([NEEDS_LIBICONV])
647-
GIT_CONF_SUBST([NO_ICONV])
648647

649648
if test -n "$NO_ICONV"; then
650649
NEEDS_LIBICONV=
651650
fi
652651

653652
fi
654653

654+
GIT_CONF_SUBST([NO_ICONV])
655+
655656
#
656657
# Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.
657658

0 commit comments

Comments
 (0)