diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.in | 15 |
3 files changed, 19 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2002-11-03 Rodrigo Moya <rodrigo@ximian.com> + + * configure.in: + * Makefile.am: re-added calendar component (only non-UI stuff). + + * data/Makefile.am: use intltools instead of xml-i18n-tools. + 2002-11-03 Ettore Perazzoli <ettore@ximian.com> * configure.in: AC_PROG_INTLTOOL instead of diff --git a/Makefile.am b/Makefile.am index 608f766574..73cddaf820 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,7 @@ SUBDIRS = \ e-util \ libical \ widgets \ + calendar \ art \ ui \ default_user \ @@ -72,3 +73,5 @@ cde-install: install dtappintegrate cde-uninstall: dtappunintegrate uninstall endif + +ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.in b/configure.in index 6a72254a4a..4810b2db7f 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,5 @@ # Process this file with autoconf to produce a configure script. +AC_PREREQ(2.52) AC_INIT(Evolution, 1.3.0.99, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution) AC_CONFIG_SRCDIR(README) @@ -1101,11 +1102,9 @@ dnl AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS) dnl --- evolution-calendar flags -dnl EVOLUTION_CALENDAR_DEPS="bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui libglade oaf vfs" - -dnl EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS}) -dnl AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) -dnl AC_SUBST(EVOLUTION_CALENDAR_LIBS) +EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 gal-2.0 libglade-2.0 gnome-vfs-2.0, ${GTKHTML_CFLAGS}, ${GTKHTML_LIBS}) +AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) +AC_SUBST(EVOLUTION_CALENDAR_LIBS) dnl EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gpilot $EVOLUTION_CALENDAR_DEPS, $PISOCK_CFLAGS) dnl AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS) @@ -1233,7 +1232,7 @@ AC_CONFIG_SUBDIRS(libical) EVOLUTION_DIR=`(cd $srcdir; pwd)` AC_SUBST(EVOLUTION_DIR) -AC_OUTPUT([ +AC_OUTPUT([ po/Makefile.in Makefile art/Makefile data/Makefile @@ -1274,6 +1273,10 @@ widgets/Makefile widgets/e-timezone-dialog/Makefile widgets/menus/Makefile widgets/misc/Makefile +calendar/Makefile +calendar/cal-util/Makefile +calendar/cal-client/Makefile +calendar/pcs/Makefile my-evolution/GNOME_Evolution_Summary.oaf.in ]) |