From d940c0dad4a4dd5e9b4c5014893c111ebf28e9e7 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 10 Dec 2003 05:25:24 +0000 Subject: put the camel-smime-context.[ch] back in here, remove it from EXTRA_DIST, 2003-12-10 Not Zed * Makefile.am (libcamel_la_SOURCES): put the camel-smime-context.[ch] back in here, remove it from EXTRA_DIST, and make it compile optinally the same way camel-tcp-stream-ssl.c does (#ifdef ...). * camel-smime-context.c (sm_verify_cmsg): add signer info to certvalidity. * camel-cipher-context.c (CamelCipherValidity): Added certinfo to validity for signing and encrypting, so we can find the keys later for a gui. (camel_cipher_validity_add_certinfo): add signer or encrypter info to the validity. (camel_cipher_validity_envelope): add sign/encrypt keys. svn path=/trunk/; revision=23904 --- camel/Makefile.am | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'camel/Makefile.am') diff --git a/camel/Makefile.am b/camel/Makefile.am index 3924e0cd80..07bfdbaead 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -17,14 +17,6 @@ INCLUDES = -I.. -I$(srcdir)/.. \ -DG_LOG_DOMAIN=\"camel\" \ $(CAMEL_CFLAGS) -if ENABLE_SMIME -SMIME_SOURCES_C = camel-smime-context.c -SMIME_SOURCES_H = camel-smime-context.h -else -SMIME_SOURCES_C = -SMIME_SOURCES_H = -endif - libcamel_la_SOURCES = \ broken-date-parser.c \ camel-address.c \ @@ -100,7 +92,7 @@ libcamel_la_SOURCES = \ camel-seekable-substream.c \ camel-service.c \ camel-session.c \ - $(SMIME_SOURCES_C) \ + camel-smime-context.c \ camel-store.c \ camel-store-summary.c \ camel-stream-buffer.c \ @@ -201,7 +193,7 @@ libcamelinclude_HEADERS = \ camel-seekable-substream.h \ camel-service.h \ camel-session.h \ - $(SMIME_SOURCES_H) \ + camel-smime-context.h \ camel-store.h \ camel-store-summary.h \ camel-stream-buffer.h \ @@ -291,6 +283,4 @@ noinst_HEADERS = \ EXTRA_DIST = \ ChangeLog.pre-1-4 \ - camel-smime-context.h \ - camel-smime-context.c \ README -- cgit