From kde-commits  Mon Jan 03 13:20:58 2011
From: Christophe Giboudeaux <cgiboudeaux () gmail ! com>
Date: Mon, 03 Jan 2011 13:20:58 +0000
To: kde-commits
Subject: KDE/kdepimlibs
Message-Id: <20110103132058.3D8C6AC8AE () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129406091021246

SVN commit 1211264 by cgiboudeaux:

Remove AKONADI_USE_STRIGI_SEARCH in kdepimlibs as well.

 M  +1 -1      CMakeLists.txt  
 M  +1 -5      akonadi/CMakeLists.txt  


--- trunk/KDE/kdepimlibs/CMakeLists.txt #1211263:1211264
@@ -80,7 +80,7 @@
 
 if (NOT KDEPIM_ONLY_KLEO)
   #FindAkonadi.cmake is only there for compatibility reasons, but we don't want to use that.
-  set(Akonadi_MIN_VERSION "1.4.81")
+  set(Akonadi_MIN_VERSION "1.4.91")
   find_package(Akonadi ${Akonadi_MIN_VERSION} QUIET NO_MODULE)
   macro_log_feature(Akonadi_FOUND "Akonadi server libraries" "Access to PIM storage and services" "http://pim.kde.org/akonadi" TRUE "${Akonadi_MIN_VERSION}" "")
 
--- trunk/KDE/kdepimlibs/akonadi/CMakeLists.txt #1211263:1211264
@@ -13,11 +13,7 @@
 add_subdirectory( tests )
 endif (KDE4_BUILD_TESTS)
 
-option(AKONADI_USE_STRIGI_SEARCH "Build Akonadi with strigi as search engine." FALSE)
-if (AKONADI_USE_STRIGI_SEARCH)
-  add_definitions(-DAKONADI_USE_STRIGI_SEARCH)
-endif (AKONADI_USE_STRIGI_SEARCH)
-
+add_definitions( ${AKONADI_DEFINITIONS} )
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )