[evolution-exchange] Fixes #604143 - cache support should be optional just like in 2.28.



commit be9c5dc33002139fa71ab956dd002f677f02da4b
Author: Wang Xin <jedy wang sun com>
Date:   Tue Dec 22 15:57:14 2009 +0800

    Fixes #604143 -  cache support should be optional just like in 2.28.

 addressbook/Makefile.am |   14 ++++++++++----
 configure.ac            |    4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 2a50377..becd016 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -44,18 +44,24 @@ libebookbackendexchange_la_SOURCES = \
 	e-book-backend-exchange.h \
 	e-book-backend-exchange-factory.c \
 	e-book-backend-gal.c \
-	e-book-backend-gal.h \
-	e-book-backend-db-cache.c \
-	e-book-backend-db-cache.h
+	e-book-backend-gal.h
 
 libebookbackendexchange_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 libebookbackendexchange_la_LIBADD = \
 	$(EVOLUTION_DATA_SERVER_LIBS) \
-	$(DB_LIBS) \
 	$(top_builddir)/tools/libevolution-exchange-shared.la
 
+if HAVE_LIBDB
+libebookbackendexchange_la_SOURCES += \
+	e-book-backend-db-cache.c \
+	e-book-backend-db-cache.h
+
+libebookbackendexchange_la_LIBADD +=  \
+	$(DB_LIBS)
+endif
+
 EXTRA_DIST = $(schema_in_files)
 
 CLEANFILES = apps_exchange_addressbook-$(BASE_VERSION).schemas
diff --git a/configure.ac b/configure.ac
index dfd279b..684d241 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,7 +268,9 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM(
 if test "x$check_db" = "xyes"; then
 	AC_MSG_RESULT([$check_db])
 else
-	AC_MSG_FAILURE([Cannot find libdb / Berkeley DB. Use --with-libdb to specify an PREFIX .])
+	AC_DEFINE(ENABLE_CACHE, 0, [Disabling GAL Caching])
+	DB_CFLAGS=""
+	DB_LIBS=""
 fi
 AM_CONDITIONAL(HAVE_LIBDB, [test "x$check_db" = "xyes"])
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]