- up to version 0.0.93

[packages/evolution-data-server.git] / evolution-data-server-system_db.patch

diff --git a/evolution-data-server-system_db.patch b/evolution-data-server-system_db.patch
index f7529db95cd2513b581901c2190094b03b070e24..bf9fb57a71f0d3fc6e6f640b3dd042966d8d0ef4 100644 (file)
--- a/evolution-data-server-system_db.patch
+++ b/evolution-data-server-system_db.patch
@@ -13,7 +13,7 @@
        md5-utils.c
  
 -libedataserver_la_LIBADD =                            \
--      $(top_builddir)/libdb/dist/libdb.a
+-      $(top_builddir)/libdb/dist/libdb-4.1.la
 +libedataserver_la_LIBADD = -ldb
  
  libedataserver_la_LDFLAGS =                                                                           \
@@ -28,10 +28,10 @@
  
  AC_OUTPUT([
  Makefile
-@@ -301,7 +300,6 @@
- calendar/backends/groupwise/Makefile
- calendar/backends/http/Makefile
+@@ -303,7 +302,6 @@
  calendar/backends/contacts/Makefile
+ calendar/tests/Makefile
+ calendar/tests/ecal/Makefile
 -libdb/Makefile
  libedataserver/Makefile
  libedataserver/libedataserver-1.0.pc
@@ -41,9 +41,9 @@
 @@ -1,6 +1,6 @@
  DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
  
--SUBDIRS = libdb libedataserver addressbook calendar src docs po
-+SUBDIRS = libedataserver addressbook calendar src docs po
- DIST_SUBDIRS= libedataserver addressbook calendar src docs po
+-SUBDIRS = libdb libedataserver servers addressbook calendar src docs po
++SUBDIRS = libedataserver servers addressbook calendar src docs po
+ DIST_SUBDIRS= libedataserver servers addressbook calendar src docs po
  
  changelogs =                  \
 @@ -21,9 +21,10 @@
@@ -56,6 +56,6 @@
  
 +# files below should be removed due to system db patch, but they are left,
 +# so patch is small
- LIBDB_FILES= \
- $(srcdir)/libdb/Makefile.am \
- $(srcdir)/libdb/Makefile.in \
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+ distclean-local:
+       (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)