From 041820e259f75978ea85dabf69a887285697cb1c Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 10 Apr 2008 16:15:26 +0000 Subject: [PATCH] Remove -liconv from the default LDFLAGS if we're building on linux, since iconv support is built-in. If this ever causes an issue between glibc and iconv support I'll add a warning. Originally committed to SVN as r2170. --- configure.in | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 353f7dfed..e6cc8b715 100644 --- a/configure.in +++ b/configure.in @@ -52,6 +52,10 @@ case "$target_or_host" in build_darwin="yes" ;; + *-*-linux*) + build_linux="yes" + ;; + *) build_default="yes" ;; @@ -398,7 +402,11 @@ AC_ARG_VAR([ICONV_CFLAGS], [CFLAGS to use for iconv (default: CPPFLAGS)]) AC_ARG_VAR([ICONV_LDFLAGS], [LDFLAGS to use for iconv (default: LDFLAGS -liconv)]) if test -z "$ICONV_LDFLAGS"; then - ICONV_LDFLAGS="$LDFLAGS -liconv"; + if "$build_linux" = "yes"; then + ICONV_LDFLAGS="$LDFLAGS" + else + ICONV_LDFLAGS="$LDFLAGS -liconv"; + fi fi if test -z "$ICONV_CFLAGS"; then