X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=CMakeLists.txt;h=2fa11d54086da2c63e8cd10f78a893ba2662196a;hp=c72e2ae7919396b29383e58698da8decc5046a2b;hb=59d195148a72f4baae904952911a246c1b4eeac4;hpb=74dda532c4844f38025d575926787532d41d613d

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c72e2ae..2fa11d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ include(XConfig)
 
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 ADD_DEFINITIONS(-D_GNU_SOURCE)
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR} ${madmutt_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${madmutt_BINARY_DIR} ${madmutt_SOURCE_DIR})
 
 SET(BINDIR     "${CMAKE_INSTALL_PREFIX}/bin")
 SET(DATADIR    "${CMAKE_INSTALL_PREFIX}/share")
@@ -34,7 +34,6 @@ SET(MAILPATH         CACHE STRING "Where new mail is spooled")
 OPTION(WITH_GPGME    "Use GPGME [default: on]" ON)
 OPTION(WITH_NNTP     "Build NNTP support [default: off]")
 OPTION(WITH_IDN      "Use GNU libidn for domain names [default: off]")
-OPTION(WITH_LIBESMTP "Use libESMTP [default: off]")
 OPTION(WITH_SLANG    "Use S-Lang instead of ncurses [default:off]")
 
 OPTION(USE_FLOCK     "Use flock to lock files [default: off]")
@@ -192,6 +191,7 @@ ENDIF(WITH_GPGME)
 XCONFIG(libgnutls-config gnutls_INCDIR gnutls_LINKDIR gnutls_LDFLAGS gnutls_CFLAGS)
 INCLUDE_DIRECTORIES(${gnutls_INCDIR})
 ADD_DEFINITIONS(${gnutls_CFLAGS})
+CHECK_INCLUDE_FILE(gnutls/openssl.h  HAVE_GNUTLS_OPENSSL_H)
 SET(MUTTLIBS "${MUTTLIBS} ${gnutls_LDFLAGS}")
 
 CHECK_LIBRARY_EXISTS(sasl2 sasl_client_init "" WITH_SASL)
@@ -240,11 +240,6 @@ IF(USE_HCACHE)
     ENDIF(NOT USE_HCACHE)
 ENDIF(USE_HCACHE)
 
-IF(WITH_LIBESMTP)
-    SET(USE_LIBESMTP 1)
-    SET(MUTTLIBS "${MUTTLIBS} -lesmtp")
-ENDIF(WITH_LIBESMTP)
-
 IF(WITH_NNTP AND NOT USE_NNTP)
     SET(USE_NNTP 1)
     MESSAGE(STATUS "building NNTP support")
@@ -318,10 +313,10 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
     buffy.cpkg
     charset.cpkg
     crypt.cpkg
+    score.cpkg
 
     account.c
     attach.c
-    base64.c
     browser.c
     commands.c
     compose.c
@@ -345,10 +340,8 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
     recvattach.c
     recvcmd.c
     remailer.c
-    score.c
     send.c
     sendlib.c
-    send_smtp.c
     sort.c
     state.c
     thread.c
@@ -371,8 +364,8 @@ TARGET_LINK_LIBRARIES(madmutt_dotlock lib)
 
 ADD_CUSTOM_COMMAND(
     OUTPUT  ${madmutt_SOURCE_DIR}/keymap_defs.h
-    DEPENDS ${madmutt_SOURCE_DIR}/OPS ${madmutt_SOURCE_DIR}/gen_defs
-    COMMAND ${madmutt_SOURCE_DIR}/gen_defs ${madmutt_SOURCE_DIR}/OPS > ${madmutt_SOURCE_DIR}/keymap_defs.h
+    DEPENDS ${madmutt_SOURCE_DIR}/OPS ${madmutt_SOURCE_DIR}/tools/gen_defs
+    COMMAND ${madmutt_SOURCE_DIR}/tools/gen_defs ${madmutt_SOURCE_DIR}/OPS > ${madmutt_SOURCE_DIR}/keymap_defs.h
     COMMENT "Generating ${madmutt_SOURCE_DIR}/keymap_defs.h from ${madmutt_SOURCE_DIR}/OPS"
 )
 ADD_CUSTOM_COMMAND(