diff options
author | Jay Berkenbilt <ejb@ql.org> | 2020-10-25 01:31:09 +0200 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2020-10-25 23:06:16 +0100 |
commit | 4e8d21d849dc4c562d02c4aa22683296cbd314f7 (patch) | |
tree | 3cd6beac7fecc761c9404bcefff0ab0a8365e638 /configure.ac | |
parent | 026330ebcdbef825a340eb04915483573b3c8be2 (diff) | |
download | qpdf-4e8d21d849dc4c562d02c4aa22683296cbd314f7.tar.zst |
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.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 136e51b7..22a699a7 100644 --- a/configure.ac +++ b/configure.ac @@ -608,8 +608,12 @@ dnl If the openssl provider is not explicitly disabled, enable it if dnl openssl is available. If the openssl provider is explicitly dnl disabled, do not link with openssl even if present. -PKG_CHECK_MODULES([pc_openssl], [openssl >= 1.1.0], - [OPENSSL_FOUND=1], [OPENSSL_FOUND=0]) +if test "$USE_EXTERNAL_LIBS" = "1"; then + OPENSSL_FOUND=1 +else + PKG_CHECK_MODULES([pc_openssl], [openssl >= 1.1.0], + [OPENSSL_FOUND=1], [OPENSSL_FOUND=0]) +fi dnl Override pkg-config if headers and libraries are present. AS_IF([test "$OPENSSL_FOUND" = "0"], @@ -958,7 +962,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 AC_OUTPUT |