diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2006-09-07 13:48:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-07 13:02:29 -0700 |
| commit | 6ff88de7f7affba3e9899cfdab4dab46b554e93f (patch) | |
| tree | 293339182952ab099276564ac5b866bef4bdecb5 /configure.ac | |
| parent | 7bbf88c52b202d543310123e1bad9a44b2d6f028 (diff) | |
| download | git-6ff88de7f7affba3e9899cfdab4dab46b554e93f.tar.gz | |
autoconf: Set NO_ICONV if iconv is found neither in libc, nor in libiconv
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 67c1ae0ed8..9bbc7dafc4 100644 --- a/configure.ac +++ b/configure.ac @@ -143,9 +143,12 @@ AC_CHECK_LIB([expat], [XML_ParserCreate], AC_SUBST(NO_EXPAT) # # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin). +# Define NO_ICONV if neither libc nor libiconv support iconv. AC_CHECK_LIB([c], [iconv], -[NEEDS_LIBICONV=], -[NEEDS_LIBICONV=YesPlease]) + [NEEDS_LIBICONV=], + AC_CHECK_LIB([iconv], [iconv], + [NEEDS_LIBICONV=YesPlease], + [GIT_CONF_APPEND_LINE([NO_ICONV=YesPlease])])) AC_SUBST(NEEDS_LIBICONV) test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv" # |