From: Marco Nelissen <marcone@xs4all.nl>
To: git@vger.kernel.org, gitster@pobox.com
Subject: [PATCH] fix handling of iconv configuration options
Date: Sun, 7 Jun 2009 17:45:48 -0700 [thread overview]
Message-ID: <3a3d9e520906071745k1fde4215xba310d945db37979@mail.gmail.com> (raw)
Fix the way in which the configure script handles --without-iconv
(and --with-iconv=no), which it used to essentially ignore.
Also fix the way the configure script determines the value of
NEEDS_LIBICONV, which would be incorrectly set to 'YesPlease' on
systems that lack iconv entirely.
Signed-off-by: Marco Nelissen <marcone@xs4all.nl>
---
Since configure.ac uses a mix of 2, 3 and 4 space indentation and tabs, I
wasn't quite sure what to do with regard to that. I decided to keep the
number of lines changed to a minimum, rather than changing indentation
for a bunch of lines.
configure.ac | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index 108a97f..3388036 100644
--- a/configure.ac
+++ b/configure.ac
@@ -385,6 +385,8 @@ AC_SUBST(NO_EXPAT)
# some Solaris installations).
# Define NO_ICONV if neither libc nor libiconv support iconv.
+if test -z $NO_ICONV; then
+
GIT_STASH_FLAGS($ICONVDIR)
AC_DEFUN([ICONVTEST_SRC], [
@@ -431,6 +433,12 @@ GIT_UNSTASH_FLAGS($ICONVDIR)
AC_SUBST(NEEDS_LIBICONV)
AC_SUBST(NO_ICONV)
+if test -n $NO_ICONV; then
+ NEEDS_LIBICONV=
+fi
+
+fi
+
#
# Define NO_DEFLATE_BOUND if deflateBound is missing from zlib.
--
1.6.3.1
next reply other threads:[~2009-06-08 0:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-08 0:45 Marco Nelissen [this message]
2009-06-08 21:50 ` [PATCH] fix handling of iconv configuration options Junio C Hamano
2009-06-08 23:51 ` Marco Nelissen
-- strict thread matches above, loose matches on Subject: below --
2009-06-09 3:46 Marco Nelissen
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3a3d9e520906071745k1fde4215xba310d945db37979@mail.gmail.com \
--to=marcone@xs4all.nl \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).