From 35313309b875cc3316619583530134cd7d029731 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Mon, 27 Jan 2003 06:06:21 +0000 Subject: fix warning. (get_default_timezone): BonoboConfigDatabase -> 2003-01-26 Chris Toshok * conduits/calendar/calendar-conduit.c (start_calendar_server): fix warning. (get_default_timezone): BonoboConfigDatabase -> e_config_listener. (accept_all_cookies): remove. (conduit_get_gpilot_conduit): remove the oaf initialization stuff. * conduits/todo/todo-conduit.c (start_calendar_server): fix warning. (get_default_timezone): BonoboConfigDatabase -> e_config_listener. (accept_all_cookies): remove. (conduit_get_gpilot_conduit): remove the oaf initialization stuff. * Makefile.am (CONDUIT_DIR): uncomment the conduit stuff. svn path=/trunk/; revision=19642 --- calendar/Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'calendar/Makefile.am') diff --git a/calendar/Makefile.am b/calendar/Makefile.am index 1d7e5941db..0e4c8d28eb 100644 --- a/calendar/Makefile.am +++ b/calendar/Makefile.am @@ -1,10 +1,9 @@ -# if ENABLE_PILOT_CONDUITS -# CONDUIT_DIR = conduits -# else -# CONDUIT_DIR = -# endif +if ENABLE_PILOT_CONDUITS +CONDUIT_DIR = conduits +else +CONDUIT_DIR = +endif -# SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR) -SUBDIRS = idl cal-util pcs cal-client gui +SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR) EXTRA_DIST = zones.h -- cgit v1.2.3