--- configure.orig	2010-08-04 17:15:28 UTC
+++ configure
@@ -3203,7 +3203,7 @@ if test "${ac_cv_lib_iconv_main+set}" = 
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv  $LIBS"
+LIBS="$ICONV_LIB $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3232,7 +3232,7 @@ if test "x$ac_cv_lib_iconv_main" = x""ye
 #define HAVE_LIBICONV 1
 _ACEOF
 
-  LIBS="-liconv $LIBS"
+  LIBS="$ICONV_LIB $LIBS"
 
 fi
 
