evolution-data-server-system_db.patch

   1 diff -urN evolution-data-server-0.0.93.orig/configure.in evolution-data-server-0.0.93/configure.in
   2 --- evolution-data-server-0.0.93.orig/configure.in      2004-05-22 12:08:38.934333552 +0200
   3 +++ evolution-data-server-0.0.93/configure.in   2004-05-22 12:11:03.053424120 +0200
   4 @@ -269,7 +269,6 @@
   5  export privincludedir
   6  export privdatadir
   7  AC_CONFIG_SUBDIRS(calendar/libical)
   8 -AC_CONFIG_SUBDIRS(libdb/dist)
   9
  10  AC_OUTPUT([
  11  Makefile
  12 @@ -301,7 +300,6 @@
  13  calendar/backends/contacts/Makefile
  14  calendar/tests/Makefile
  15  calendar/tests/ecal/Makefile
  16 -libdb/Makefile
  17  libedataserver/Makefile
  18  libedataserver/libedataserver-1.0.pc
  19  servers/Makefile
  20 diff -urN evolution-data-server-0.0.93.orig/libedataserver/Makefile.am evolution-data-server-0.0.93/libedataserver/Makefile.am
  21 --- evolution-data-server-0.0.93.orig/libedataserver/Makefile.am        2004-05-22 12:08:37.715518840 +0200
  22 +++ evolution-data-server-0.0.93/libedataserver/Makefile.am     2004-05-22 12:10:23.587423864 +0200
  23 @@ -1,7 +1,6 @@
  24  INCLUDES =                                                             \
  25         -I$(top_srcdir)                                                 \
  26         -DG_LOG_DOMAIN=\"e-data-server\"                                \
  27 -       -I$(top_srcdir)/libdb/dist                                      \
  28         $(E_DATA_SERVER_CFLAGS)
  29
  30  # The marshallers
  31 @@ -33,9 +32,7 @@
  32         e-xml-hash-utils.c              \
  33         md5-utils.c
  34
  35 -libedataserver_la_LIBADD =                             \
  36 -       $(E_DATA_SERVER_LIBS)                           \
  37 -       $(top_builddir)/libdb/dist/libdb-4.1.la
  38 +libedataserver_la_LIBADD = -ldb
  39
  40  libedataserver_la_LDFLAGS =                                                                            \
  41         -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE)
  42 diff -urN evolution-data-server-0.0.93.orig/Makefile.am evolution-data-server-0.0.93/Makefile.am
  43 --- evolution-data-server-0.0.93.orig/Makefile.am       2004-05-22 12:08:38.915336440 +0200
  44 +++ evolution-data-server-0.0.93/Makefile.am    2004-05-22 12:13:09.128257832 +0200
  45 @@ -1,7 +1,7 @@
  46  AUTOMAKE_OPTIONS = 1.6
  47  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
  48
  49 -SUBDIRS = libdb libedataserver servers addressbook calendar src docs po
  50 +SUBDIRS = libedataserver servers addressbook calendar src docs po
  51  DIST_SUBDIRS= libedataserver servers addressbook calendar src docs po
  52
  53  changelogs =                   \
  54 @@ -22,9 +22,10 @@
  55         intltool-merge.in       \
  56         intltool-update.in      \
  57         intltool-extract.in     \
  58 -       $(pkgconfig_DATA:.pc=.pc.in) \
  59 -       $(LIBDB_FILES)
  60 +       $(pkgconfig_DATA:.pc=.pc.in)
  61
  62 +# files below should be removed due to system db patch, but they are left,
  63 +# so patch is small
  64  DISTCLEANFILES = intltool-extract intltool-merge intltool-update
  65  distclean-local:
  66         (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)