X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=CMakeLists.txt;h=90b91b4ee3355d63d166e4f59e98d526906fdb21;hp=00674330710ade8989765ab56c9563188c8c9538;hb=cc8910fb496d58eb30e116d06a0a01dde4dc944c;hpb=e87df0bb071ba21d6e3d6a47cb797c135605eba5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0067433..90b91b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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]")
@@ -241,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")
@@ -308,11 +302,9 @@ ADD_SUBDIRECTORY(lib-mime)
 ADD_SUBDIRECTORY(lib-sys)
 ADD_SUBDIRECTORY(lib-ui)
 ADD_SUBDIRECTORY(imap)
-IF(WITH_NNTP)
-    ADD_SUBDIRECTORY(nntp)
-ENDIF(WITH_NNTP)
 ADD_SUBDIRECTORY(lib-mx)
 ADD_SUBDIRECTORY(lib-lua)
+ADD_SUBDIRECTORY(po)
 
 MADMUTT_SOURCES(madmuttsrc madmuttgen
     alias.cpkg
@@ -354,13 +346,14 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
 
     main.c
 )
-
-ADD_EXECUTABLE(madmutt ${madmuttsrc})
 IF(WITH_NNTP)
-    TARGET_LINK_LIBRARIES(madmutt mime sys mx lua imap nntp ui lib)
-ELSE(WITH_NNTP)
-    TARGET_LINK_LIBRARIES(madmutt mime sys mx lua imap ui lib)
+    MADMUTT_SOURCES(madmuttsrc madmuttgen
+        nntp.c
+    )
 ENDIF(WITH_NNTP)
+
+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)