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>
Andreas Herrmann committed
Jul 19, 2023 at 16:29 UTC
fb8f7269c2fc69ada6238bc766168adbfd15a369
1 file changed
+2
-1
configure.ac
+2
-1
@@ -644,7 +644,6 @@ LIBS="$old_LIBS"
644
GIT_UNSTASH_FLAGS($ICONVDIR)
645
646
GIT_CONF_SUBST([NEEDS_LIBICONV])
647
-GIT_CONF_SUBST([NO_ICONV])
647
648
if test -n "$NO_ICONV"; then
649
NEEDS_LIBICONV=
@@ -652,6 +651,8 @@ fi
651
652
fi
653
654
+GIT_CONF_SUBST([NO_ICONV])
655
+
656
#
657
# Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.
658