diff mbox series

[3/3] configure.ac: always save NO_ICONV to config.status

Message ID 20230719145211.17854-8-aherrmann@suse.de (mailing list archive)
State Accepted
Commit fb8f7269c2fc69ada6238bc766168adbfd15a369
Headers show
Series configure.ac: misc configure fixes | expand

Commit Message

Andreas Herrmann July 19, 2023, 2:29 p.m. UTC 
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>
---
 configure.ac | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

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.