Index: configure
--- configure.orig	2021-09-13 16:46:32.000000000 +0200
+++ configure	2021-09-22 20:06:32.477430000 +0200
@@ -5568,10 +5568,7 @@
 then :
 
 else $as_nop
-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-printf "%s\n" "$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
@@ -23911,7 +23908,7 @@
   printf %s "(cached) " >&6
 else $as_nop
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-l"$LDAPLIBNAME"  $LIBS"
+LIBS="-l$LDAPLIBNAME  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -23946,7 +23943,7 @@
 #define `printf "%s\n" "HAVE_LIB"$LDAPLIBNAME"" | $as_tr_cpp` 1
 _ACEOF
 
-  LIBS="-l"$LDAPLIBNAME" $LIBS"
+  LIBS="-l$LDAPLIBNAME $LIBS"
 
 else $as_nop
 
@@ -45099,7 +45096,7 @@
             want_thres="no"
       ;;
     *)
-            want_thres="yes"
+            want_thres="$OPT_THRES"
       ;;
   esac
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $want_thres" >&5
Index: curl-config.in
--- curl-config.in.orig	2021-08-23 00:23:06.000000000 +0200
+++ curl-config.in	2021-09-22 20:04:36.091973000 +0200
@@ -150,7 +150,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	2021-09-11 23:46:15.000000000 +0200
+++ lib/vtls/openssl.c	2021-09-22 20:04:36.092462000 +0200
@@ -111,6 +111,9 @@
 #ifdef USE_OPENSSL_ENGINE
 #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