--- configure.orig	2013-09-26 18:07:07.000000000 +0200
+++ configure	2013-09-26 18:08:15.000000000 +0200
@@ -603,6 +603,9 @@
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
@@ -5977,7 +5980,7 @@
 fi
 
 GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
+ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
 
 
  if test "x$with_runtime_libdir" != "x"; then
@@ -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
 
     ;;
@@ -23369,7 +23372,7 @@
 fi
 done
 
-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid
+for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -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"
     ;;
   *)