aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog9
-rw-r--r--camel/Makefile.am2
-rw-r--r--camel/camel-tcp-stream-ssl.c3
-rw-r--r--camel/camel.c2
4 files changed, 12 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index b14322244f..91dfe7267b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,12 @@
+2001-03-17 Jeffrey Stedfast <fejj@ximian.com>
+
+ * Makefile.am: Don't include system include dir.
+
+ * camel.c: Use quotes around the nss.h include so it doesn't try
+ to use the systen nss.h file.
+
+ * camel-tcp-stream-ssl.c: Same here.
+
2001-03-17 Not Zed <NotZed@Ximian.com>
* providers/local/camel-maildir-summary.c (maildir_summary_sync):
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 8c77f7fad6..1b99bf9847 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -7,7 +7,7 @@ providerdir = $(libdir)/evolution/camel-providers/$(VERSION)
lib_LTLIBRARIES = libcamel.la
-INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \
+INCLUDES = -I.. -I$(srcdir)/.. \
-I$(top_srcdir)/intl \
-I$(top_srcdir)/e-util \
$(GLIB_CFLAGS) \
diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c
index 8aa4080660..708c58e364 100644
--- a/camel/camel-tcp-stream-ssl.c
+++ b/camel/camel-tcp-stream-ssl.c
@@ -37,7 +37,7 @@
#include <prio.h>
#include <prerror.h>
#include <prerr.h>
-#include <nss.h>
+#include "nss.h" /* Don't use <> here or it will include the system nss.h instead */
#include <ssl.h>
static CamelTcpStreamClass *parent_class = NULL;
@@ -335,7 +335,6 @@ ssl_bad_cert (void *data, PRFileDesc *sockfd)
CamelService *service;
char *prompt, *cert_str;
gpointer accept;
- PRUint32 len;
g_return_val_if_fail (data != NULL, SECFailure);
g_return_val_if_fail (CAMEL_IS_SERVICE (data), SECFailure);
diff --git a/camel/camel.c b/camel/camel.c
index ba70162aca..8233e98925 100644
--- a/camel/camel.c
+++ b/camel/camel.c
@@ -29,7 +29,7 @@
#ifdef HAVE_NSS
#include <nspr.h>
#include <prthread.h>
-#include <nss.h>
+#include "nss.h" /* Don't use <> here or it will include the system nss.h instead */
#include <ssl.h>
#endif /* HAVE_NSS */