diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 8 |
3 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2002-11-13 Not Zed <NotZed@Ximian.com> + + * Makefile.am (SUBDIRS): re-added filter, mail, composer + + * configure.in: Added EVOLUTION_MAIL settings, and mail/makefile. + 2002-11-11 Joe Shaw <joe@ximian.com> * Makefile.am (SUBDIRS): remove tools for now, it's not in diff --git a/Makefile.am b/Makefile.am index c58168e832..c343e0bd25 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ confexec_DATA = \ evolution_addressbookConf.sh \ evolution_calendarConf.sh -EXTRA_DIST = \ +EXTRA_DIST = \ AUTHORS \ $(changelogs) \ COPYING-DOCS \ @@ -22,7 +22,7 @@ EXTRA_DIST = \ xml-i18n-extract.in \ $(confexec_DATA:.sh=.sh.in) -SUBDIRS = \ +SUBDIRS = \ data \ e-util \ libical \ @@ -30,11 +30,13 @@ SUBDIRS = \ widgets \ shell \ camel \ - filter \ libwombat \ addressbook \ calendar \ art \ + filter \ + composer \ + mail \ ui \ default_user \ views \ diff --git a/configure.in b/configure.in index 7a92d270ee..48d541ceb4 100644 --- a/configure.in +++ b/configure.in @@ -1124,9 +1124,9 @@ AC_SUBST(privlibdir) camel_providerdir="$privlibdir/camel-providers" AC_SUBST(camel_providerdir) -dnl EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, $FULL_GNOME_DEPS soup, $GCONF_CFLAGS $THREADS_CFLAGS ${GTKHTML_CFLAGS}, $GCONF_LIBS $THREADS_LIBS ${GTKHTML_LIBS}) -dnl AC_SUBST(EVOLUTION_MAIL_CFLAGS) -dnl AC_SUBST(EVOLUTION_MAIL_LIBS) +EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 libglade-2.0 soup-2.0 libgnomeprint-2.0 libgtkhtml-3.0 libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0) +AC_SUBST(EVOLUTION_MAIL_CFLAGS) +AC_SUBST(EVOLUTION_MAIL_LIBS) dnl -- wombat flags @@ -1319,6 +1319,8 @@ calendar/gui/alarm-notify/Makefile calendar/gui/dialogs/Makefile calendar/importers/Makefile composer/Makefile +mail/Makefile +mail/GNOME_Evolution_Mail.server.in my-evolution/GNOME_Evolution_Summary.server.in ]) |