various fixes and simplifications wrt openssl.h

[apps/madmutt.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c01875..0067433 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")
@@ -192,6 +192,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)
@@ -322,7 +323,6 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
 
     account.c
     attach.c
-    base64.c
     browser.c
     commands.c
     compose.c
@@ -348,7 +348,6 @@ MADMUTT_SOURCES(madmuttsrc madmuttgen
     remailer.c
     send.c
     sendlib.c
-    send_smtp.c
     sort.c
     state.c
     thread.c