--- configure.orig	2016-08-30 14:20:13 UTC
+++ configure
@@ -20308,12 +20308,6 @@ $as_echo "#define HAVE_NOTIFY1 1" >>conf
 	fi
 fi
 
-case "$host_os" in
-	*freebsd*)
-		LDFLAGS="$LDFLAGS -pthread"
-	;;
-esac
-
 case "$host_cpu" in
 	*arm*)
 
@@ -21198,17 +21192,10 @@ fi
 
 
 if test "$lime" != "false" ; then
-	if test "x$found_polarssl" != "xyes" ; then
-		if test "$lime" = "true" ; then
-			as_fn_error $? "\"LIME requires POLARSSL in version >= 1.3\"" "$LINENO" 5
-		fi
-		lime=false
-	else
 
 $as_echo "#define HAVE_LIME 1" >>confdefs.h
 
 		lime=true
-	fi
 fi
 
  if test x$console_ui = xtrue; then
@@ -22153,14 +22140,14 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
 $as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
 if test "x$ac_cv_lib_sqlite3_sqlite3_open" = xyes; then :
-  SQLITE3_LIBS+=" -lsqlite3 "; found_sqlite=yes
+  SQLITE3_LIBS="$SQLITE3_LIBS -lsqlite3 "; found_sqlite=yes
 else
   foo=bar
 fi
 
 	fi
 	if test "$found_sqlite" = "yes"; then
-		SQLITE3_CFLAGS+=" -DSQLITE_STORAGE_ENABLED"
+		SQLITE3_CFLAGS="$SQLITE3_CFLAGS -DSQLITE_STORAGE_ENABLED"
 		if test "$build_macos" = "yes" -o "$ios_found" = "yes"; then
 			SQLITE3_LIBS+=" -liconv"
 		fi
