evolution-data-server-system_db.patch

   1 diff -aurN evolution-data-server-1.5.5.orig/Makefile.am evolution-data-server-1.5.5/Makefile.am
   2 --- evolution-data-server-1.5.5.orig/Makefile.am        2005-12-08 08:54:12.000000000 +0100
   3 +++ evolution-data-server-1.5.5/Makefile.am     2006-01-22 21:07:02.287051000 +0100
   4 @@ -1,7 +1,7 @@
   5  AUTOMAKE_OPTIONS = 1.6
   6  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
   7
   8 -SUBDIRS = libdb win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
   9 +SUBDIRS = win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
  10  DIST_SUBDIRS= win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po
  11
  12  changelogs =                   \
  13 @@ -27,9 +27,10 @@
  14         intltool-update.in                              \
  15         intltool-extract.in                             \
  16         evolution-data-server-zip.in                    \
  17 -       $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)     \
  18 -       $(LIBDB_FILES)
  19 +       $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
  20
  21 +# files below should be removed due to system db patch, but they are left
  22 +# so patch is small
  23  DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
  24  distclean-local:
  25         (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)
  26 diff -aurN evolution-data-server-1.5.5.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.5.5/addressbook/backends/file/Makefile.am
  27 --- evolution-data-server-1.5.5.orig/addressbook/backends/file/Makefile.am      2005-06-22 14:34:21.000000000 +0200
  28 +++ evolution-data-server-1.5.5/addressbook/backends/file/Makefile.am   2006-01-22 21:02:28.917051000 +0100
  29 @@ -4,7 +4,6 @@
  30         -I$(top_builddir)                               \
  31         -I$(top_srcdir)/addressbook                     \
  32         -I$(top_builddir)/addressbook                   \
  33 -       -I$(top_srcdir)/libdb/dist                      \
  34          $(EVOLUTION_ADDRESSBOOK_CFLAGS)
  35
  36  extension_LTLIBRARIES = libebookbackendfile.la
  37 @@ -18,8 +17,8 @@
  38         $(top_builddir)/addressbook/libebook/libebook-1.2.la            \
  39         $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la  \
  40         $(top_builddir)/libedataserver/libedataserver-1.2.la            \
  41 -       $(top_builddir)/libdb/dist/libdb-4.1.la                         \
  42 -       $(EVOLUTION_ADDRESSBOOK_LIBS)
  43 +       $(EVOLUTION_ADDRESSBOOK_LIBS)                                   \
  44 +       -ldb
  45
  46  libebookbackendfile_la_LDFLAGS =       \
  47         -module -avoid-version $(NO_UNDEFINED)
  48 diff -aurN evolution-data-server-1.5.5.orig/configure.in evolution-data-server-1.5.5/configure.in
  49 --- evolution-data-server-1.5.5.orig/configure.in       2006-01-17 09:48:52.000000000 +0100
  50 +++ evolution-data-server-1.5.5/configure.in    2006-01-22 21:03:31.387051000 +0100
  51 @@ -1270,7 +1270,6 @@
  52  export privincludedir
  53  export privdatadir
  54  AC_CONFIG_SUBDIRS(calendar/libical)
  55 -AC_CONFIG_SUBDIRS(libdb/dist)
  56
  57  AC_OUTPUT([
  58  Makefile
  59 @@ -1328,7 +1327,6 @@
  60  camel/tests/stream/Makefile
  61  camel/camel.pc
  62  camel/camel-provider.pc
  63 -libdb/Makefile
  64  libedataserver/Makefile
  65  libedataserver/libedataserver.pc
  66  libedataserverui/Makefile
  67 diff -aurN evolution-data-server-1.5.5.orig/libedataserver/Makefile.am evolution-data-server-1.5.5/libedataserver/Makefile.am
  68 --- evolution-data-server-1.5.5.orig/libedataserver/Makefile.am 2006-01-16 09:43:14.000000000 +0100
  69 +++ evolution-data-server-1.5.5/libedataserver/Makefile.am      2006-01-22 21:05:44.877051000 +0100
  70 @@ -1,7 +1,6 @@
  71  INCLUDES =                                                             \
  72         -I$(top_srcdir)                                                 \
  73         -DG_LOG_DOMAIN=\"e-data-server\"                                \
  74 -       -I$(top_srcdir)/libdb/dist                                      \
  75         -DE_DATA_SERVER_PREFIX=\"$(prefix)\"                            \
  76         -DEVOLUTION_LOCALEDIR=\""$(localedir)"\"                        \
  77         -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\"                \
  78 @@ -49,7 +48,7 @@
  79  libedataserver_1_2_la_LIBADD =                                 \
  80         $(E_DATA_SERVER_LIBS)                           \
  81         $(ICONV_LIBS)                                   \
  82 -       $(top_builddir)/libdb/dist/libdb-4.1.la         \
  83 +       -ldb                                            \
  84         $(SOCKET_LIBS)
  85
  86  libedataserver_1_2_la_LDFLAGS = \