Index: configure
--- configure.orig	2017-08-13 18:22:16.000000000 +0200
+++ configure	2017-09-01 23:12:52.113607000 +0200
@@ -5400,10 +5400,7 @@
 if $ac_preproc_ok; then :
 
 else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+    :
 fi
 
 ac_ext=c
@@ -21853,7 +21850,7 @@
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-l"$LDAPLIBNAME"  $LIBS"
+LIBS="-l$LDAPLIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -21886,7 +21883,7 @@
 #define `$as_echo "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1
 _ACEOF
 
-  LIBS="-l"$LDAPLIBNAME" $LIBS"
+  LIBS="-l$LDAPLIBNAME $LIBS"
 
 else
 
@@ -40661,7 +40658,7 @@
 
   case "$OPT_THRES" in
     *)
-            want_thres="yes"
+            want_thres="$OPT_THRES"
       ;;
     no)
             want_thres="no"
Index: curl-config.in
--- curl-config.in.orig	2017-08-08 00:42:29.000000000 +0200
+++ curl-config.in	2017-09-01 23:10:11.461019000 +0200
@@ -137,7 +137,7 @@
         if test "X@includedir@" = "X/usr/include"; then
           echo "$CPPFLAG_CURL_STATICLIB"
         else
-          echo "${CPPFLAG_CURL_STATICLIB}-I@includedir@"
+          echo "${CPPFLAG_CURL_STATICLIB} -I@includedir@"
         fi
         ;;
 
Index: lib/vtls/openssl.c
--- lib/vtls/openssl.c.orig	2017-08-13 18:10:42.000000000 +0200
+++ lib/vtls/openssl.c	2017-09-01 23:10:11.461438000 +0200
@@ -87,6 +87,9 @@
 #if defined(HAVE_OPENSSL_ENGINE_H)
 #include <openssl/ui.h>
 #endif
+#if defined(HAVE_ENGINE_LOAD_BUILTIN_ENGINES)
+#include <openssl/engine.h>
+#endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x00909000L
 #define SSL_METHOD_QUAL const