aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog12
-rw-r--r--camel/camel-tcp-stream-ssl.h3
-rw-r--r--camel/providers/imap/Makefile.am5
-rw-r--r--camel/providers/smtp/Makefile.am2
-rw-r--r--camel/providers/smtp/camel-smtp-transport.c1
5 files changed, 16 insertions, 7 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index ee281db3bd..81ef2d5295 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,15 @@
+2001-03-15 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-tcp-stream-ssl.h: Uninclude prnetdb.h since it's not
+ needed here.
+
+ * providers/smtp/camel-smtp-transport.c: #include prnetdb.h here
+ instead of making camel-tcp-stream-ssl.h include it. Prevents some
+ header bloat.
+
+ * providers/smtp/Makefile.am: Include the NSPR_CFLAGS and
+ NSS_CFLAGS.
+
2001-03-14 Jeffrey Stedfast <fejj@ximian.com>
* providers/smtp/camel-smtp-transport.c (smtp_connect): Update for
diff --git a/camel/camel-tcp-stream-ssl.h b/camel/camel-tcp-stream-ssl.h
index c0ad2f8a43..883e1cda2a 100644
--- a/camel/camel-tcp-stream-ssl.h
+++ b/camel/camel-tcp-stream-ssl.h
@@ -35,8 +35,7 @@ extern "C" {
#ifdef HAVE_NSS
#include <camel/camel-tcp-stream.h>
#include <camel/camel-service.h>
-#include <mozilla/nspr.h>
-#include <mozilla/prnetdb.h>
+#include <nspr.h>
#define CAMEL_TCP_STREAM_SSL_TYPE (camel_tcp_stream_ssl_get_type ())
#define CAMEL_TCP_STREAM_SSL(obj) (CAMEL_CHECK_CAST((obj), CAMEL_TCP_STREAM_SSL_TYPE, CamelTcpStreamSSL))
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index 39e160c879..d38302004c 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -45,8 +45,3 @@ noinst_HEADERS = \
camel-imap-private.h
EXTRA_DIST = libcamelimap.urls
-
-
-
-
-
diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am
index 734a4e5128..ca683eeb5f 100644
--- a/camel/providers/smtp/Makefile.am
+++ b/camel/providers/smtp/Makefile.am
@@ -16,6 +16,8 @@ INCLUDES = \
-I$(top_srcdir)/camel \
-I$(top_srcdir)/e-util \
$(GTK_INCLUDEDIR) \
+ $(NSPR_CFLAGS) \
+ $(NSS_CFLAGS) \
-DG_LOG_DOMAIN=\"camel-smtp-provider\"
libcamelsmtp_la_SOURCES = \
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index c3a5f2ac79..93d0447c2f 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -49,6 +49,7 @@
#include "camel-tcp-stream-raw.h"
#ifdef HAVE_NSS
#include "camel-tcp-stream-ssl.h"
+#include <prnetdb.h>
#endif
#include "camel-session.h"
#include "camel-exception.h"