style

[apps/madmutt.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8b3f3e..2fa11d5 100644 (file)
--- 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(
@@ -381,37 +374,12 @@ ADD_CUSTOM_COMMAND(
     COMMAND sh ${madmutt_SOURCE_DIR}/charset.def > ${madmutt_SOURCE_DIR}/charset.gperf
     COMMENT "Generating ${madmutt_SOURCE_DIR}/charset.gperf from ${madmutt_SOURCE_DIR}/charset.def"
 )
-SET(__mt ${madmutt_SOURCE_DIR}/lib-mime/mime-token)
-ADD_CUSTOM_COMMAND(
-    OUTPUT ${__mt}.h
-    MAIN_DEPENDENCY ${__mt}.sh ${__mt}.def
-    COMMAND sh ${__mt}.sh ${__mt}.h < ${__mt}.def
-    COMMENT "Generating ${__mt}.h from ${__mt}.def"
-)
-SET(__lt ${madmutt_SOURCE_DIR}/lib-lua/lua-token)
-ADD_CUSTOM_COMMAND(
-    OUTPUT ${__lt}.h
-    MAIN_DEPENDENCY ${__lt}.gperf
-    COMMAND sh ${__lt}.gperf ${__lt}.h || \(${RM} ${__lt}.h; exit 1\)
-    COMMENT "Generating ${__lt}.h from ${__lt}.gperf"
-)
-SET(__lm ${madmutt_SOURCE_DIR}/lib-lua/madmutt)
-ADD_CUSTOM_COMMAND(
-    OUTPUT ${__lm}.li
-    MAIN_DEPENDENCY ${__lm}.cpkg
-    COMMAND ${madmutt_SOURCE_DIR}/tools/cpkg2c -h ${__lm}.cpkg > ${__lm}.li || \(${RM} ${__lm}.li; exit 1\)
-    COMMENT "Generating ${__lm}.li from ${__lm}.cpkg"
-)
-ADD_CUSTOM_TARGET(
-    generate_files
-    DEPENDS
-        ${madmuttgen}
-        ${madmutt_SOURCE_DIR}/keymap_defs.h
-        ${madmutt_SOURCE_DIR}/charset.gperf
-        ${madmutt_SOURCE_DIR}/lib-mime/mime-token.h
-        ${madmutt_SOURCE_DIR}/lib-lua/lua-token.h
-        ${madmutt_SOURCE_DIR}/lib-lua/madmutt.li
+ADD_CUSTOM_TARGET(generate_file
+    DEPENDS ${madmuttgen}
+    ${madmutt_SOURCE_DIR}/keymap_defs.h
+    ${madmutt_SOURCE_DIR}/charset.gperf
 )
-ADD_DEPENDENCIES(madmutt generate_files)
+ADD_DEPENDENCIES(generate_file generate_files)
+ADD_DEPENDENCIES(madmutt generate_file)
 
 # }}}