| | 1 | diff -urN aa/evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am |
| | 2 | --- aa/evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am 2004-10-14 17:50:17.000000000 +0200 |
| | 3 | +++ evolution-data-server-1.1.4.2/addressbook/backends/file/Makefile.am 2005-02-07 17:12:29.879046432 +0100 |
| | 4 | @@ -4,7 +4,6 @@ |
| | 5 | -I$(top_builddir) \ |
| | 6 | -I$(top_srcdir)/addressbook \ |
| | 7 | -I$(top_builddir)/addressbook \ |
| | 8 | - -I$(top_srcdir)/libdb/dist \ |
| | 9 | $(EVOLUTION_ADDRESSBOOK_CFLAGS) |
| | 10 | |
| | 11 | extension_LTLIBRARIES = libebookbackendfile.la |
| | 12 | diff -urN aa/evolution-data-server-1.1.4.2/configure.in evolution-data-server-1.1.4.2/configure.in |
| | 13 | --- aa/evolution-data-server-1.1.4.2/configure.in 2005-01-26 18:50:11.000000000 +0100 |
| | 14 | +++ evolution-data-server-1.1.4.2/configure.in 2005-02-07 17:09:29.476471792 +0100 |
| | 15 | @@ -1163,7 +1163,6 @@ |
| | 16 | export privincludedir |
| | 17 | export privdatadir |
| | 18 | AC_CONFIG_SUBDIRS(calendar/libical) |
| | 19 | -AC_CONFIG_SUBDIRS(libdb/dist) |
| | 20 | |
| | 21 | AC_OUTPUT([ |
| | 22 | Makefile |
| | 23 | @@ -1217,7 +1216,6 @@ |
| | 24 | camel/tests/stream/Makefile |
| | 25 | camel/camel.pc |
| | 26 | camel/camel-provider.pc |
| | 27 | -libdb/Makefile |
| | 28 | libedataserver/Makefile |
| | 29 | libedataserver/libedataserver.pc |
| | 30 | libedataserverui/Makefile |
| | 31 | diff -urN aa/evolution-data-server-1.1.4.2/libedataserver/Makefile.am evolution-data-server-1.1.4.2/libedataserver/Makefile.am |
| | 32 | --- aa/evolution-data-server-1.1.4.2/libedataserver/Makefile.am 2005-01-10 17:00:02.000000000 +0100 |
| | 33 | +++ evolution-data-server-1.1.4.2/libedataserver/Makefile.am 2005-02-07 17:10:18.724984880 +0100 |
| | 34 | @@ -1,7 +1,6 @@ |
| | 35 | INCLUDES = \ |
| | 36 | -I$(top_srcdir) \ |
| | 37 | -DG_LOG_DOMAIN=\"e-data-server\" \ |
| | 38 | - -I$(top_srcdir)/libdb/dist \ |
| | 39 | -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \ |
| | 40 | -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \ |
| | 41 | $(E_DATA_SERVER_CFLAGS) |
| | 42 | @@ -44,7 +43,7 @@ |
| | 43 | libedataserver_1_2_la_LIBADD = \ |
| | 44 | $(E_DATA_SERVER_LIBS) \ |
| | 45 | $(ICONV_LIBS) \ |
| | 46 | - $(top_builddir)/libdb/dist/libdb-4.1.la |
| | 47 | + -ldb |
| | 48 | |
| | 49 | libedataserver_1_2_la_LDFLAGS = \ |
| | 50 | -version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE) |
| | 51 | diff -urN aa/evolution-data-server-1.1.4.2/Makefile.am evolution-data-server-1.1.4.2/Makefile.am |
| | 52 | --- aa/evolution-data-server-1.1.4.2/Makefile.am 2005-01-10 16:59:52.000000000 +0100 |
| | 53 | +++ evolution-data-server-1.1.4.2/Makefile.am 2005-02-07 17:11:27.480532448 +0100 |
| | 54 | @@ -1,7 +1,7 @@ |
| | 55 | AUTOMAKE_OPTIONS = 1.6 |
| | 56 | DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc |
| | 57 | |
| | 58 | -SUBDIRS = libdb libedataserver servers camel addressbook calendar libedataserverui src docs art po |
| | 59 | +SUBDIRS = libedataserver servers camel addressbook calendar libedataserverui src docs art po |
| | 60 | DIST_SUBDIRS= libedataserver servers camel addressbook calendar libedataserverui src docs art po |
| | 61 | |
| | 62 | changelogs = \ |
| | 63 | @@ -26,9 +26,10 @@ |
| | 64 | intltool-merge.in \ |
| | 65 | intltool-update.in \ |
| | 66 | intltool-extract.in \ |
| | 67 | - $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) \ |
| | 68 | - $(LIBDB_FILES) |
| | 69 | + $(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in) |
| | 70 | |
| | 71 | +# files below should be removed due to system db patch, but they are left, |
| | 72 | +# so patch is small |
| | 73 | DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA) |
| | 74 | distclean-local: |
| | 75 | (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean) |
projects / packages / evolution-data-server.git / blame_incremental