aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog5
-rw-r--r--camel/Makefile.am12
2 files changed, 15 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index fb3f2470e8..e7de1f232d 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-26 JP Rosevear <jpr@ximian.com>
+
+ * Makefile.am (libcamelinclude_HEADERS): conditionally compile
+ s/mime support
+
2003-11-25 Not Zed <NotZed@Ximian.com>
* camel-cipher-context.c (camel_cipher_validity_envelope): change
diff --git a/camel/Makefile.am b/camel/Makefile.am
index eee87b84db..8b9ccb3a36 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -18,6 +18,14 @@ INCLUDES = -I.. -I$(srcdir)/.. \
-DG_DISABLE_DEPRECATED \
$(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 \
@@ -93,7 +101,7 @@ libcamel_la_SOURCES = \
camel-seekable-substream.c \
camel-service.c \
camel-session.c \
- camel-smime-context.c \
+ $(SMIME_SOURCES_C) \
camel-store.c \
camel-store-summary.c \
camel-stream-buffer.c \
@@ -194,7 +202,7 @@ libcamelinclude_HEADERS = \
camel-seekable-substream.h \
camel-service.h \
camel-session.h \
- camel-smime-context.h \
+ $(SMIME_SOURCES_H) \
camel-store.h \
camel-store-summary.h \
camel-stream-buffer.h \