X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=CMakeLists.txt;h=77d668602914b96786a61a79da8384e9f030a1ae;hp=338c0e34c5aaae797e7ded0e2b3ae6f25b7c5f16;hb=7bd63759186d38d5a751b94fe7ee047d69ba1287;hpb=90f0c4dfb0480b5ce043c54f001d53ba6efc531b

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 338c0e3..77d6686 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
 PROJECT(madmutt C D)
 SET(PACKAGE madmutt)
+SET(CMAKE_SKIP_RPATH ON)
 
 # Using Phobos OR Tango (can be specified from cmake command line)
 if (NOT CMAKE_D_USE_PHOBOS AND NOT CMAKE_D_USE_TANGO)
@@ -25,7 +26,7 @@ SET(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/madmutt")
 SET(PKGDOCDIR  "${CMAKE_INSTALL_PREFIX}/share/doc/madmutt")
 SET(SYSCONFDIR "${CMAKE_INSTALL_PREFIX}/etc")
 SET(VERSION    "devel")
-SET(MUTTLIBS   "")
+SET(MUTTLIBS   "-lpthread")
 
 ADD_DEFINITIONS("-DBINDIR=\\\"${BINDIR}\\\"")
 ADD_DEFINITIONS("-DPKGDATADIR=\\\"${PKGDATADIR}\\\"")
@@ -37,9 +38,6 @@ ADD_DEFINITIONS("-DMUTTLOCALEDIR=\\\"${DATADIR}/locale\\\"")
 SET(MAILPATH         CACHE STRING "Where new mail is spooled")
 OPTION(WITH_GPGME    "Use GPGME [default: on]" ON)
 OPTION(WITH_IDN      "Use GNU libidn for domain names [default: off]")
-
-OPTION(USE_FLOCK     "Use flock to lock files [default: off]")
-OPTION(USE_FCNTL     "Use fcntl to lock files [default: on]" ON)
 OPTION(USE_HCACHE    "Enable headers caching  [default: off]")
 
 FIND_FILE(SENDMAIL sendmail
@@ -171,7 +169,6 @@ LIST(APPEND MUTTLIBS -llockfile)
 
 IF(USE_HCACHE)
     OPTION(WITH_TC   "Use tokyocabinet for header caching [default: on]" ON)
-    OPTION(WITH_QDBM "Use qdbm for header caching [default: off]" OFF)
     OPTION(WITH_GDBM "Use gdbm for header caching [default: off]")
     SET(USE_HCACHE)
 
@@ -182,15 +179,6 @@ IF(USE_HCACHE)
         SET(USE_HCACHE 1)
         SET(HAVE_TOKYOCABINET 1)
     ENDIF(WITH_TC)
-    IF(WITH_QDBM)
-        pkg_search_module(QDBM REQUIRED qdbm)
-        ADD_DEFINITIONS(${QDBM_CFLAGS})
-        SET(QDBM_LDFLAGS "${QDBM_LDFLAGS}")
-        # LIST(APPEND MUTTLIBS ${QDBM_LDFLAGS})
-        LIST(APPEND MUTTLIBS -lqdbm)
-        SET(USE_HCACHE 1)
-        SET(HAVE_QDBM 1)
-    ENDIF(WITH_QDBM)
 
     IF(NOT USE_HCACHE AND WITH_GDBM)
         CHECK_LIBRARY_EXISTS(gdbm gdbm_open "" GDBM)
@@ -323,7 +311,6 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
     mutt_sasl.c
     pager.c
     pattern.c
-    pop.c
     postpone.c
     recvattach.c
     recvcmd.c