git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andreas Herrmann <aherrmann@suse.de>
To: git@vger.kernel.org
Cc: Andreas Herrmann <aherrmann@suse.de>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 3/3] configure.ac: always save NO_ICONV to config.status
Date: Wed, 19 Jul 2023 16:29:58 +0200	[thread overview]
Message-ID: <20230719145211.17854-8-aherrmann@suse.de> (raw)
In-Reply-To: <20230719145211.17854-2-aherrmann@suse.de>

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


  parent reply	other threads:[~2023-07-19 14:53 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-19 14:29 [PATCH 0/3] configure.ac: misc configure fixes Andreas Herrmann
2023-07-19 14:29 ` [PATCH 1/3] configure.ac: don't overwrite NO_EXPAT option Andreas Herrmann
2023-07-19 14:29 ` [PATCH 2/3] configure.ac: don't overwrite NO_CURL option Andreas Herrmann
2023-07-19 14:29 ` Andreas Herrmann [this message]
2023-07-19 21:35 ` [PATCH 0/3] configure.ac: misc configure fixes Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230719145211.17854-8-aherrmann@suse.de \
    --to=aherrmann@suse.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).