From 4e8d21d849dc4c562d02c4aa22683296cbd314f7 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sat, 24 Oct 2020 19:31:09 -0400
Subject: Build Windows releases with openssl; automate external libraries

External libraries for Windows are now built automatically in the
qpdf/external-libs repository and include openssl in addition to zlib
and jpeg. Use these, and update the Windows build to build with the
openssl crypto provider by default. We leave the native crypto
provider enabled in case there is a problem with openssl and also to
continue to exercise that code.
---
 configure | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 12cf68cc..1c26421b 100755
--- a/configure
+++ b/configure
@@ -17829,6 +17829,9 @@ $as_echo "#define USE_CRYPTO_NATIVE 1" >>confdefs.h
 fi
 
 
+if test "$USE_EXTERNAL_LIBS" = "1"; then
+  OPENSSL_FOUND=1
+else
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pc_openssl" >&5
@@ -17900,6 +17903,7 @@ else
 $as_echo "yes" >&6; }
 	OPENSSL_FOUND=1
 fi
+fi
 
 if test "$OPENSSL_FOUND" = "0"; then :
   ac_fn_c_check_header_mongrel "$LINENO" "openssl/evp.h" "ac_cv_header_openssl_evp_h" "$ac_includes_default"
@@ -18601,7 +18605,7 @@ if test "$USE_EXTERNAL_LIBS" = "1"; then
    # much trouble getting it to work with a different compiler.
    CPPFLAGS="$CPPFLAGS -Iexternal-libs/include"
    LDFLAGS="$LDFLAGS -Lexternal-libs/lib-$BUILDRULES$WINDOWS_WORDSIZE"
-   LIBS="$LIBS -lz -ljpeg"
+   LIBS="$LIBS -lz -ljpeg -lssl -lcrypto -lmsvcrt -lws2_32 -lshell32 -ladvapi32 -lgdi32 -luser32 -lcrypt32"
 fi
 
 cat >confcache <<\_ACEOF
-- 
cgit v1.2.3-54-g00ecf