diff options
| author | Jakub Narebski <jnareb@gmail.com> | 2006-09-07 13:48:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-07 13:04:21 -0700 |
| commit | baf1219acbda6ba361c388363ba2e771d95bbb2d (patch) | |
| tree | a3d231e201a7e5c5202d101419161673f68d0d5d | |
| parent | 6ff88de7f7affba3e9899cfdab4dab46b554e93f (diff) | |
| download | git-baf1219acbda6ba361c388363ba2e771d95bbb2d.tar.gz git-baf1219acbda6ba361c388363ba2e771d95bbb2d.tar.xz | |
autoconf: Add support for setting NO_ICONV and ICONVDIR
Add support for ./configure options --without-iconv (if neither libc
nor libiconv properly support iconv), and for --with-iconv=PATH (to
set prefix to libiconv library and headers, used only when
NEED_LIBICONV is set). While at it, make ./configure set or unset
NO_ICONV always (it is not autodetected in Makefile).
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | config.mak.in | 1 | ||||
| -rw-r--r-- | configure.ac | 13 |
2 files changed, 13 insertions, 1 deletions
diff --git a/config.mak.in b/config.mak.in index 369e6116e..6d20673b2 100644 --- a/config.mak.in +++ b/config.mak.in @@ -37,4 +37,5 @@ NO_C99_FORMAT=@NO_C99_FORMAT@ NO_STRCASESTR=@NO_STRCASESTR@ NO_STRLCPY=@NO_STRLCPY@ NO_SETENV=@NO_SETENV@ +NO_ICONV=@NO_ICONV@ diff --git a/configure.ac b/configure.ac index 9bbc7dafc..511cac93d 100644 --- a/configure.ac +++ b/configure.ac @@ -148,8 +148,9 @@ AC_CHECK_LIB([c], [iconv], [NEEDS_LIBICONV=], AC_CHECK_LIB([iconv], [iconv], [NEEDS_LIBICONV=YesPlease], - [GIT_CONF_APPEND_LINE([NO_ICONV=YesPlease])])) + [NO_ICONV=YesPlease])) AC_SUBST(NEEDS_LIBICONV) +AC_SUBST(NO_ICONV) test -n "$NEEDS_LIBICONV" && LIBS="$LIBS -liconv" # # Define NEEDS_SOCKET if linking with libc is not enough (SunOS, @@ -343,6 +344,16 @@ GIT_PARSE_WITH(expat)) # library directories by defining CFLAGS and LDFLAGS appropriately. # # Define NO_MMAP if you want to avoid mmap. +# +# Define NO_ICONV if your libc does not properly support iconv. +AC_ARG_WITH(iconv, +AS_HELP_STRING([--without-iconv], +[if your architecture doesn't properly support iconv]) +AS_HELP_STRING([--with-iconv=PATH], +[PATH is prefix for libiconv library and headers]) +AS_HELP_STRING([], +[used only if you need linking with libiconv]), +GIT_PARSE_WITH(iconv)) ## --enable-FEATURE[=ARG] and --disable-FEATURE # |