evolution-data-server r9082 - in branches/EXCHANGE_MAPI_BRANCH: . calendar calendar/backends/caldav calendar/backends/contacts calendar/backends/file calendar/backends/google calendar/backends/groupwise calendar/backends/http calendar/backends/mapi calendar/backends/weather calendar/libecal calendar/libedata-cal calendar/tests/ecal libedataserver src
- From: msuman svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution-data-server r9082 - in branches/EXCHANGE_MAPI_BRANCH: . calendar calendar/backends/caldav calendar/backends/contacts calendar/backends/file calendar/backends/google calendar/backends/groupwise calendar/backends/http calendar/backends/mapi calendar/backends/weather calendar/libecal calendar/libedata-cal calendar/tests/ecal libedataserver src
- Date: Thu, 3 Jul 2008 03:24:46 +0000 (UTC)
Author: msuman
Date: Thu Jul 3 03:24:45 2008
New Revision: 9082
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9082&view=rev
Log:
MAPI branch - Compile LibiCal before compiling servers.
Modified:
branches/EXCHANGE_MAPI_BRANCH/ (props changed)
branches/EXCHANGE_MAPI_BRANCH/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/ (props changed)
branches/EXCHANGE_MAPI_BRANCH/calendar/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/backends/caldav/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/backends/contacts/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/backends/file/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/backends/google/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/backends/groupwise/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/backends/http/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/backends/weather/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/libecal/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/libedata-cal/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/calendar/tests/ecal/Makefile.am
branches/EXCHANGE_MAPI_BRANCH/configure.in
branches/EXCHANGE_MAPI_BRANCH/libedataserver/e-source-group.c
branches/EXCHANGE_MAPI_BRANCH/src/Makefile.am
Modified: branches/EXCHANGE_MAPI_BRANCH/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/Makefile.am Thu Jul 3 03:24:45 2008
@@ -5,12 +5,17 @@
LIBDB = libdb
endif
+if ENABLE_LIBICAL
+LIBICAL = libical
+endif
+
if ENABLE_CALENDAR
CALENDAR_DIR = calendar
endif
-SUBDIRS = $(LIBDB) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
-DIST_SUBDIRS= win32 libedataserver libebackend servers camel addressbook calendar libedataserverui src docs art po
+SUBDIRS = $(LIBDB) $(LIBICAL) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
+DIST_SUBDIRS = $(LIBICAL) win32 libedataserver libebackend servers camel addressbook calendar libedataserverui src docs art po
+
changelogs = \
ChangeLog
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/Makefile.am Thu Jul 3 03:24:45 2008
@@ -1 +1,2 @@
-SUBDIRS = libical idl libecal libedata-cal backends tests
\ No newline at end of file
+SUBDIRS = idl libecal libedata-cal backends tests
+
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/caldav/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/caldav/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/caldav/Makefile.am Thu Jul 3 03:24:45 2008
@@ -1,13 +1,13 @@
-INCLUDES = \
- $(EVOLUTION_CALENDAR_CFLAGS) \
- -I$(top_srcdir) \
- -I$(top_srcdir)/calendar \
- -I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
- $(SOUP_CFLAGS) \
+INCLUDES = \
+ $(EVOLUTION_CALENDAR_CFLAGS) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/calendar \
+ -I$(top_builddir)/calendar \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
+ $(SOUP_CFLAGS) \
-DG_LOG_DOMAIN=\"e-cal-backend-caldav\"
extension_LTLIBRARIES = libecalbackendcaldav.la
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/contacts/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/contacts/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/contacts/Makefile.am Thu Jul 3 03:24:45 2008
@@ -4,10 +4,10 @@
-I$(top_builddir) \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/addressbook \
-I$(top_builddir)/addressbook \
$(EVOLUTION_CALENDAR_CFLAGS)
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/file/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/file/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/file/Makefile.am Thu Jul 3 03:24:45 2008
@@ -4,10 +4,10 @@
-I$(top_builddir) \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
$(EVOLUTION_CALENDAR_CFLAGS)
extension_LTLIBRARIES = libecalbackendfile.la
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/google/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/google/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/google/Makefile.am Thu Jul 3 03:24:45 2008
@@ -4,10 +4,10 @@
-I$(top_builddir) \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/servers/google/libgdata \
-I$(top_builddir)/servers/google/libgdata \
-I$(top_srcdir)/servers/google/libgdata-google \
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/groupwise/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/groupwise/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/groupwise/Makefile.am Thu Jul 3 03:24:45 2008
@@ -4,10 +4,10 @@
-I$(top_builddir) \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/servers/groupwise \
-I$(top_builddir)/servers/groupwise \
$(EVOLUTION_CALENDAR_CFLAGS) \
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/http/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/http/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/http/Makefile.am Thu Jul 3 03:24:45 2008
@@ -4,10 +4,10 @@
-I$(top_builddir) \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
$(EVOLUTION_CALENDAR_CFLAGS) \
$(SOUP_CFLAGS)
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/mapi/Makefile.am Thu Jul 3 03:24:45 2008
@@ -4,10 +4,10 @@
-I$(top_builddir) \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/servers/mapi \
-I$(top_builddir)/servers/mapi \
-DMAPI_DATADIR=\""$(mapidatadir)"\" \
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/backends/weather/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/backends/weather/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/backends/weather/Makefile.am Thu Jul 3 03:24:45 2008
@@ -4,10 +4,10 @@
-I$(top_builddir) \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/addressbook \
-I$(top_builddir)/addressbook \
-DE_DATA_SERVER_PREFIX=\"$(prefix)\" \
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/libecal/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/libecal/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/libecal/Makefile.am Thu Jul 3 03:24:45 2008
@@ -7,9 +7,9 @@
-I$(top_builddir) \
-I$(top_builddir)/calendar/libecal \
-I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
$(EVOLUTION_CALENDAR_CFLAGS)
# The corba stubs and skels
@@ -55,11 +55,11 @@
e-cal-view-listener.h \
e-cal-view-private.h
-libecal_1_2_la_LIBADD = \
- $(top_builddir)/calendar/libical/src/libical/libical-evolution.la \
- $(top_builddir)/calendar/libical/src/libicalvcal/libicalvcal-evolution.la \
- $(top_builddir)/calendar/libical/src/libicalss/libicalss-evolution.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
+libecal_1_2_la_LIBADD = \
+ $(top_builddir)/libical/src/libical/libical-evolution.la \
+ $(top_builddir)/libical/src/libicalvcal/libicalvcal-evolution.la \
+ $(top_builddir)/libical/src/libicalss/libicalss-evolution.la \
+ $(top_builddir)/libedataserver/libedataserver-1.2.la \
$(EVOLUTION_CALENDAR_LIBS)
libecal_1_2_la_LDFLAGS = \
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/libedata-cal/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/libedata-cal/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/libedata-cal/Makefile.am Thu Jul 3 03:24:45 2008
@@ -1,13 +1,13 @@
-INCLUDES = \
- -DG_LOG_DOMAIN=\"libedata-cal\" \
- -I$(top_srcdir) \
- -I$(top_builddir) \
- -I$(top_srcdir)/calendar \
- -I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"libedata-cal\" \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+ -I$(top_srcdir)/calendar \
+ -I$(top_builddir)/calendar \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
$(EVOLUTION_CALENDAR_CFLAGS)
CORBA_GENERATED_H = \
Modified: branches/EXCHANGE_MAPI_BRANCH/calendar/tests/ecal/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/calendar/tests/ecal/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/calendar/tests/ecal/Makefile.am Thu Jul 3 03:24:45 2008
@@ -4,10 +4,10 @@
-I$(top_builddir) \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
$(EVOLUTION_CALENDAR_CFLAGS)
EXTRA_DIST = \
@@ -27,7 +27,7 @@
-DG_LOG_DOMAIN=\"test-ecal\"
test_ecal_LDADD = \
$(top_builddir)/calendar/libecal/libecal-1.2.la \
- $(top_builddir)/calendar/libical/src/libical/libical-evolution.la \
+ $(top_builddir)/libical/src/libical/libical-evolution.la \
$(EVOLUTION_CALENDAR_LIBS)
test_recur_SOURCES = test-recur.c
@@ -36,7 +36,7 @@
-DG_LOG_DOMAIN=\"test-ecal\"
test_recur_LDADD = \
$(top_builddir)/calendar/libecal/libecal-1.2.la \
- $(top_builddir)/calendar/libical/src/libical/libical-evolution.la \
+ $(top_builddir)/libical/src/libical/libical-evolution.la \
$(EVOLUTION_CALENDAR_LIBS)
test_search_SOURCES = test-search.c
@@ -45,5 +45,5 @@
-DG_LOG_DOMAIN=\"test-ecal\"
test_search_LDADD = \
$(top_builddir)/calendar/libecal/libecal-1.2.la \
- $(top_builddir)/calendar/libical/src/libical/libical-evolution.la \
+ $(top_builddir)/libical/src/libical/libical-evolution.la \
$(EVOLUTION_CALENDAR_LIBS)
Modified: branches/EXCHANGE_MAPI_BRANCH/configure.in
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/configure.in (original)
+++ branches/EXCHANGE_MAPI_BRANCH/configure.in Thu Jul 3 03:24:45 2008
@@ -991,13 +991,32 @@
if test "x${enable_calendar}" != "xno"; then
AC_DEFINE(ENABLE_CALENDAR, 1, [Define if Calendar should be built])
- AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [Define it once memory returned by libical is free'ed properly])
fi
AM_CONDITIONAL(ENABLE_CALENDAR, test x$enable_calendar = xyes)
AC_MSG_RESULT($enable_calendar)
msg_calendar=$enable_calendar
dnl **************************************************
+dnl LibiCal support
+dnl **************************************************
+AC_MSG_CHECKING(if we should build LibiCal)
+AC_ARG_ENABLE(libical,
+ AC_HELP_STRING( [--enable-libical=@<:@yes/no@:>@],
+ [Build bundled LibiCal (default yes)(--enable-calendar=yes implies --enable-libical=yes)]),
+ enable_libical="$enableval", enable_libical="yes")
+
+if test "x${enable_calendar}" != "xno"; then
+ enable_libical="yes"
+fi
+if test "x${enable_libical}" != "xno"; then
+ AC_DEFINE(ENABLE_LIBICAL, 1, [Define if LibiCal should be built])
+ AC_DEFINE(HANDLE_LIBICAL_MEMORY, 1, [Define it once memory returned by LibiCal is free'ed properly])
+fi
+AM_CONDITIONAL(ENABLE_LIBICAL, test x$enable_libical = xyes)
+AC_MSG_RESULT($enable_libical)
+msg_libical=$enable_libical
+
+dnl **************************************************
dnl NNTP support.
dnl **************************************************
AC_ARG_ENABLE(nntp,
@@ -1679,8 +1698,8 @@
export privincludedir
export privdatadir
-if test $enable_calendar = yes; then
- AC_CONFIG_SUBDIRS(calendar/libical)
+if test $enable_libical = yes; then
+ AC_CONFIG_SUBDIRS(libical)
fi
if test $dynamic_libdb = no; then
AC_CONFIG_SUBDIRS(libdb/dist)
@@ -1796,6 +1815,7 @@
echo "
evolution-data-server has been configured as follows:
Calendar: $msg_calendar
+ LibiCal: $msg_libical
Mail Directory: $system_mail_dir, $system_mail_perm
LDAP support: $msg_ldap"
if test "$msg_nntp" = "yes"; then
Modified: branches/EXCHANGE_MAPI_BRANCH/libedataserver/e-source-group.c
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/libedataserver/e-source-group.c (original)
+++ branches/EXCHANGE_MAPI_BRANCH/libedataserver/e-source-group.c Thu Jul 3 03:24:45 2008
@@ -316,7 +316,6 @@
goto done;
}
e_source_group_add_source (new, new_source, -1);
- g_object_unref (new_source);
}
e_source_group_set_readonly (new, readonly_str && !strcmp (GC readonly_str, "yes"));
@@ -714,7 +713,6 @@
group);
g_signal_emit (group, signals[SOURCE_REMOVED], 0, source);
g_signal_emit (group, signals[CHANGED], 0);
- g_object_unref (source);
return TRUE;
}
}
@@ -744,7 +742,6 @@
group);
g_signal_emit (group, signals[SOURCE_REMOVED], 0, source);
g_signal_emit (group, signals[CHANGED], 0);
- g_object_unref (source);
return TRUE;
}
}
Modified: branches/EXCHANGE_MAPI_BRANCH/src/Makefile.am
==============================================================================
--- branches/EXCHANGE_MAPI_BRANCH/src/Makefile.am (original)
+++ branches/EXCHANGE_MAPI_BRANCH/src/Makefile.am Thu Jul 3 03:24:45 2008
@@ -10,10 +10,10 @@
-I$(top_srcdir)/calendar \
-I$(top_srcdir)/calendar \
-I$(top_builddir)/calendar \
- -I$(top_srcdir)/calendar/libical/src \
- -I$(top_builddir)/calendar/libical/src \
- -I$(top_srcdir)/calendar/libical/src/libical \
- -I$(top_builddir)/calendar/libical/src/libical \
+ -I$(top_srcdir)/libical/src \
+ -I$(top_builddir)/libical/src \
+ -I$(top_srcdir)/libical/src/libical \
+ -I$(top_builddir)/libical/src/libical \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
$(SOUP_CFLAGS) \
$(E_FACTORY_CFLAGS) \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]