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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 607f6bf..2fa11d5 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]")
@@ -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")