diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-02-04 13:11:56 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2019-02-04 13:11:56 +0000 |
| commit | 57b000a781b8aec8a979f31c134d50fdffb0b768 (patch) | |
| tree | cdc9587e3f25d67f22470e5dbe7006a93fd11e40 | |
| parent | 6250214ebaa02e6600eae7c37061ac641a109980 (diff) | |
| parent | 7b98ffd345f13d96896f54c5c054d087fc21d856 (diff) | |
| download | gnutls-57b000a781b8aec8a979f31c134d50fdffb0b768.tar.gz | |
Merge branch 'fix-pkcs11-mechs' into 'master'
build: do not generate mech-list.h if p11-kit is not available
See merge request gnutls/gnutls!904
| -rw-r--r-- | src/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index eb3c578648..0374924c53 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -56,7 +56,7 @@ ARGS_STAMPS = \ systemkey-args.stamp srptool-args.stamp ocsptool-args.stamp p11tool-args.stamp \ danetool-args.stamp serv-args.stamp psktool-args.stamp -BUILT_SOURCES = $(ARGS_BUILT) mech-list.h +BUILT_SOURCES = $(ARGS_BUILT) DISTCLEANFILES = $(BUILT_SOURCES) $(ARGS_STAMPS) @@ -226,8 +226,9 @@ libcmd_danetool_la_LIBADD += $(INET_PTON_LIB) $(LIB_CLOCK_GETTIME) # p11 tool if ENABLE_PKCS11 +BUILT_SOURCES += mech-list.h p11tool_SOURCES = p11tool-args.def p11tool.c pkcs11.c certtool-common.c \ - certtool-extras.c p11tool.h common.c + certtool-extras.c p11tool.h common.c mech-list.h p11tool_LDADD = ../lib/libgnutls.la p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la gl/libgnu_gpl.la p11tool_LDADD += $(COMMON_LIBS) |