X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=CMakeLists.txt;h=67bede316a720be0aa8b1e1c6e07383cf89f1d78;hb=cfe08f2ca21af629f74268f1f1425a5fec0494cd;hp=d234c5e4649306de5d86e157def9a398784fcd2d;hpb=84bc6d1930165b21919541b3b24294a9d99c3541;p=apps%2Fmadmutt.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d234c5e..67bede3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,6 @@ SET(CMAKE_MODULE_PATH  ${madmutt_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 
 # TODO {{{
 # USE_SETGID
-# DOTLOCK_{GROUP,PERMISSION}
 # }}}
 
 INCLUDE(CMakeDetermineCCompiler)
@@ -43,10 +42,6 @@ FIND_FILE(SENDMAIL sendmail
     PATHS /usr/sbin /sbin /usr/lib
     DOC   "path to sendmail executable"
 )
-FIND_FILE(MIXMASTER mixmaster DOC "path to mixmaster")
-IF(NOT MIXMASTER)
-    SET(MIXMASTER "mixmaster")
-ENDIF(NOT MIXMASTER)
 
 IF(NOT MAILPATH)
     IF(EXISTS /var/mail)
@@ -115,22 +110,7 @@ INCLUDE (CheckFunctionExists)
 CHECK_FUNCTION_EXISTS(strlimit    HAVE_SETRLIMIT)
 CHECK_FUNCTION_EXISTS(getsid      HAVE_GETSID)
 CHECK_FUNCTION_EXISTS(setegid     HAVE_SETEGID)
-CHECK_FUNCTION_EXISTS(isctype     HAVE_ISCTYPE)
 CHECK_FUNCTION_EXISTS(getopt      HAVE_GETOPT)
-CHECK_FUNCTION_EXISTS(regcomp     HAVE_REGCOMP)
-CHECK_FUNCTION_EXISTS(iswalnum    HAVE_ISWALNUM)
-CHECK_FUNCTION_EXISTS(iswalpha    HAVE_ISWALPHA)
-CHECK_FUNCTION_EXISTS(iswcntrl    HAVE_ISWCNTRL)
-CHECK_FUNCTION_EXISTS(iswdigit    HAVE_ISWDIGIT)
-CHECK_FUNCTION_EXISTS(iswgraph    HAVE_ISWGRAPH)
-CHECK_FUNCTION_EXISTS(iswlower    HAVE_ISWLOWER)
-CHECK_FUNCTION_EXISTS(iswprint    HAVE_ISWPRINT)
-CHECK_FUNCTION_EXISTS(iswpunct    HAVE_ISWPUNCT)
-CHECK_FUNCTION_EXISTS(iswspace    HAVE_ISWSPACE)
-CHECK_FUNCTION_EXISTS(iswupper    HAVE_ISWUPPER)
-CHECK_FUNCTION_EXISTS(iswxdigit   HAVE_ISWXDIGIT)
-CHECK_FUNCTION_EXISTS(towupper    HAVE_TOWUPPER)
-CHECK_FUNCTION_EXISTS(towlower    HAVE_TOWLOWER)
 CHECK_FUNCTION_EXISTS(nl_langinfo HAVE_LANGINFO_CODESET)
 
 # }}}
@@ -151,12 +131,6 @@ ELSE(HAVE_NCURSESW_NCURSES_H)
     MESSAGE(FATAL_ERROR "could not find ncurses.h")
 ENDIF(HAVE_NCURSESW_NCURSES_H)
 SET(CMAKE_REQUIRED_LIBRARIES ${MUTTLIBS})
-CHECK_FUNCTION_EXISTS(start_color        HAVE_START_COLOR)
-CHECK_FUNCTION_EXISTS(typeahead          HAVE_TYPEAHEAD)
-CHECK_FUNCTION_EXISTS(bkgdset            HAVE_BKGDSET)
-CHECK_FUNCTION_EXISTS(curs_set           HAVE_CURS_SET)
-CHECK_FUNCTION_EXISTS(meta               HAVE_META)
-CHECK_FUNCTION_EXISTS(use_default_colors HAVE_USE_DEFAULT_COLORS)
 CHECK_FUNCTION_EXISTS(resizeterm         HAVE_RESIZETERM)
 SET(CMAKE_REQUIRED_LIBRARIES)
 SET(CMAKE_REQUIRED_INCLUDES)
@@ -193,6 +167,12 @@ IF(WITH_IDN)
     SET(HAVE_LIBIDN 1)
 ENDIF(WITH_IDN)
 
+CHECK_LIBRARY_EXISTS(lockfile lockfile_create "" WITH_LOCKFILE)
+IF(NOT WITH_LOCKFILE)
+    MESSAGE(FATAL_ERROR "lockfile not found")
+ENDIF(NOT WITH_LOCKFILE)
+SET(MUTTLIBS "${MUTTLIBS} -llockfile")
+
 IF(USE_HCACHE)
     OPTION(WITH_QDBM "Use qdbm for header caching [default: on]" ON)
     OPTION(WITH_GDBM "Use gdbm for header caching [default: off]")
@@ -308,7 +288,6 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
     copy.c
     editmsg.c
     flags.c
-    from.c
     handler.c
     headers.c
     help.c
@@ -324,7 +303,6 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
     postpone.c
     recvattach.c
     recvcmd.c
-    remailer.c
     send.c
     sendlib.c
     sort.c
@@ -343,9 +321,6 @@ ADD_EXECUTABLE(madmutt ${madmuttsrc})
 TARGET_LINK_LIBRARIES(madmutt mime sys mx lua imap ui lib)
 SET_TARGET_PROPERTIES(madmutt PROPERTIES LINK_FLAGS ${MUTTLIBS})
 
-ADD_EXECUTABLE(madmutt_dotlock dotlock.c)
-TARGET_LINK_LIBRARIES(madmutt_dotlock lib)
-
 # generate_files hack {{{
 
 ADD_CUSTOM_COMMAND(