--- configure.orig	2013-09-26 18:07:07.000000000 +0200
+++ configure	2013-09-26 18:08:15.000000000 +0200
@@ -7643,13 +7646,12 @@
 
       ;;
     native)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
-$as_echo_n "checking for iconv_open in -liconv... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open" >&5
+$as_echo_n "checking for iconv_open... " >&6; }
 if ${ac_cv_lib_iconv_iconv_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -8684,6 +8686,7 @@
     ;;
   native)
 
+ICONV_LIBS=""
 $as_echo "#define USE_LIBICONV_NATIVE 1" >>confdefs.h
 
     ;;
@@ -27013,10 +27016,10 @@
   *android*)
     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
     ;;
-  *-*-freebsd*|*-*-linux*)
+  *-*-linux*)
     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
     ;;
-  *-*-openbsd*)
+  *-*-freebsd*|*-*-openbsd*)
     LDFLAGS="$LDFLAGS -pthread"
     ;;
   *)