aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/Makefile.am1
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/Makefile.am2
4 files changed, 13 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index d2aec28651..39846f46ca 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-03 Jason Leach <leach@wam.umd.edu>
+
+ * Makefile.am (INCLUDES): add $(UNICODE_CFLAGS) to the INCLUDES,
+ people who installed libunicde in non-standard include paths need
+ this.
+
2000-05-03 NotZed <NotZed@HelixCode.com>
* camel-mime-utils.c (rfc2047_decode_word): If the iconv handle is
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 57e222c8f1..81914c5950 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -10,6 +10,7 @@ lib_LTLIBRARIES = libcamel.la
INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) \
-I$(top_srcdir)/intl \
$(GTK_INCLUDEDIR) \
+ $(UNICODE_CFLAGS) \
-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
-DG_LOG_DOMAIN=\"camel\"
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 3492ab5252..e247c4296a 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-03 Jason Leach <leach@wam.umd.edu>
+
+ * Makefile.am (evolution_mail_LDADD): s/-lunicode/$(UNICODE_LIBS)/
+ in the LDADD section.
+
2000-05-03 Dan Winship <danw@helixcode.com>
* mail-format.c (write_recipients_to_stream, write_headers): Make
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 0962c13457..5f7701749a 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -58,7 +58,7 @@ evolution_mail_LDADD = \
../e-util/libeutil.la \
../libibex/libibex.la \
$(BONOBO_HTML_GNOME_LIBS) \
- -lunicode
+ $(UNICODE_LIBS)
test_mail_SOURCES = \
test-mail.c