| ce5b54d2 |
1 | diff -Nur evolution-data-server-0.0.3.orig/configure.in evolution-data-server-0.0.3/configure.in |
| 2 | --- evolution-data-server-0.0.3.orig/configure.in 2003-12-08 01:09:35.000000000 +0100 |
| 3 | +++ evolution-data-server-0.0.3/configure.in 2003-12-15 16:57:54.000000000 +0100 |
| 4 | @@ -257,7 +257,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 | @@ -285,7 +284,6 @@ |
| 13 | calendar/backends/file/Makefile |
| 14 | calendar/backends/groupwise/Makefile |
| 15 | calendar/backends/http/Makefile |
| 16 | -libdb/Makefile |
| 17 | libedataserver/Makefile |
| 18 | libedataserver/libedataserver-1.0.pc |
| 19 | src/Makefile |
| 20 | diff -Nur evolution-data-server-0.0.3.orig/libedataserver/Makefile.am evolution-data-server-0.0.3/libedataserver/Makefile.am |
| 21 | --- evolution-data-server-0.0.3.orig/libedataserver/Makefile.am 2003-12-01 19:04:04.000000000 +0100 |
| 22 | +++ evolution-data-server-0.0.3/libedataserver/Makefile.am 2003-12-15 16:57:54.000000000 +0100 |
| 23 | @@ -2,7 +2,6 @@ |
| 24 | -I$(top_srcdir) \ |
| 25 | -DG_LOG_DOMAIN=\"e-data-server\" \ |
| 26 | -DG_DISABLE_DEPRECATED \ |
| 27 | - -I$(top_srcdir)/libdb/dist \ |
| 28 | $(E_DATA_SERVER_CFLAGS) |
| 29 | |
| 30 | # The marshallers |
| 31 | @@ -34,8 +33,7 @@ |
| 32 | e-xml-hash-utils.c \ |
| 33 | md5-utils.c |
| 34 | |
| 35 | -libedataserver_la_LIBADD = \ |
| 36 | - $(top_builddir)/libdb/dist/libdb.a |
| 37 | +libedataserver_la_LIBADD = -ldb |
| 38 | |
| 39 | libedataserver_la_LDFLAGS = \ |
| 40 | -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) |
| 41 | diff -Nur evolution-data-server-0.0.3.orig/Makefile.am evolution-data-server-0.0.3/Makefile.am |
| 42 | --- evolution-data-server-0.0.3.orig/Makefile.am 2003-11-26 18:10:38.000000000 +0100 |
| 43 | +++ evolution-data-server-0.0.3/Makefile.am 2003-12-15 16:59:35.000000000 +0100 |
| 44 | @@ -1,6 +1,6 @@ |
| 45 | DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc |
| 46 | |
| 47 | -SUBDIRS = libdb libedataserver addressbook calendar src docs po |
| 48 | +SUBDIRS = libedataserver addressbook calendar src docs po |
| 49 | DIST_SUBDIRS= libedataserver addressbook calendar src docs po |
| 50 | |
| 51 | ACLOCAL_AMFLAGS = -I m4 |
| 52 | @@ -23,9 +23,10 @@ |
| 53 | intltool-merge.in \ |
| 54 | intltool-update.in \ |
| 55 | intltool-extract.in \ |
| 56 | - $(pkgconfig_DATA:.pc=.pc.in) \ |
| 57 | - $(LIBDB_FILES) |
| 58 | + $(pkgconfig_DATA:.pc=.pc.in) |
| 59 | |
| 60 | +# files below should be removed due to system db patch, but they are left, |
| 61 | +# so patch is small |
| 62 | LIBDB_FILES= \ |
| 63 | $(srcdir)/libdb/Makefile.am \ |
| 64 | $(srcdir)/libdb/Makefile.in \ |
projects / packages / evolution-data-server.git / blame