diff options
| author | Paul Gardiner <paul.gardiner@artifex.com> | 2018-02-01 13:19:48 +0000 |
|---|---|---|
| committer | Paul Gardiner <paul.gardiner@artifex.com> | 2018-02-02 12:38:36 +0000 |
| commit | 8ec561d1bccc46e9db40a9f61310cd8b3763914e (patch) | |
| tree | 9db671082225933f9429ac9c0cc9ec1f4aaea3a1 /Makefile | |
| parent | e0b3451e473885a39ed54c8bf7a98e48a3cf5502 (diff) | |
| download | mupdf-8ec561d1bccc46e9db40a9f61310cd8b3763914e.tar.xz | |
Signature support: add a null pdf_check_signature function
Add a version of pdf_check_signature function that reports no support,
for builds without openssl. This allows the removal of ifdefs from the
apps.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -141,7 +141,10 @@ CBZ_SRC := $(sort $(wildcard source/cbz/*.c)) HTML_SRC := $(sort $(wildcard source/html/*.c)) GPRF_SRC := $(sort $(wildcard source/gprf/*.c)) THREAD_SRC := $(sort $(wildcard source/helpers/mu-threads/*.c)) -PKCS7_SRC := $(sort $(wildcard source/helpers/pkcs7/*.c)) +PKCS7_SRC := $(wildcard source/helpers/pkcs7/pkcs7-check.c) +ifeq "$(HAVE_LIBCRYPTO)" "yes" +PKCS7_SRC += $(wildcard source/helpers/pkcs7/pkcs7-openssl.c) +endif FITZ_SRC_HDR := $(wildcard source/fitz/*.h) PDF_SRC_HDR := $(wildcard source/pdf/*.h) source/pdf/pdf-name-table.h @@ -325,9 +328,7 @@ generate: $(JAVASCRIPT_GEN) MUPDF_LIB = $(OUT)/libmupdf.a THIRD_LIB = $(OUT)/libmupdfthird.a THREAD_LIB = $(OUT)/libmuthreads.a -ifeq "$(HAVE_LIBCRYPTO)" "yes" PKCS7_LIB = $(OUT)/libmupkcs7.a -endif MUPDF_OBJ := \ $(FITZ_OBJ) \ @@ -357,9 +358,7 @@ THIRD_OBJ := \ $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) : $(THIRD_OBJ) $(THREAD_LIB) : $(THREAD_OBJ) -ifeq "$(HAVE_LIBCRYPTO)" "yes" $(PKCS7_LIB) : $(PKCS7_OBJ) -endif INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) |