--- configure.orig	Tue May  3 14:25:31 2011
+++ configure	Sat Jun 16 10:56:29 2012
@@ -5469,7 +5469,7 @@ for lib in socket inet ws2_32 network; do
     *) ne__code="socket();" ;;
     esac
 
-    LIBS="$ne_sl_save_LIBS -l$lib $NEON_LIBS"
+    LIBS="$ne_sl_save_LIBS -l$lib -liconv $NEON_LIBS"
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14999,7 +14999,7 @@ if test "$ne_cv_libsfor_bindtextdomain" = "not found";
 elif test "$ne_cv_libsfor_bindtextdomain" = "none needed"; then
    :
 else
-   NEON_LIBS="$ne_cv_libsfor_bindtextdomain $NEON_LIBS"
+   NEON_LIBS="$ne_cv_libsfor_bindtextdomain -liconv $NEON_LIBS"
 
 fi
 
