X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=f7734fb06e459494a30dececdf93b6f4464bce6f;hp=90d5e1a27d56dbfbcaf8e0cb931ae5f0e34772a6;hb=03c8a86d85fc313b6772a1cdfc07e635583f9ed0;hpb=97e1d274dfbeb8b4a5da3f2b68fb66f96b7739d3

diff --git a/main.c b/main.c
index 90d5e1a..f7734fb 100644
--- a/main.c
+++ b/main.c
@@ -46,11 +46,7 @@ extern int optind;
 #endif
 
 #ifdef USE_NNTP
-#include <nntp/nntp.h>
-#endif
-
-#ifdef USE_LIBESMTP
-#include <libesmtp.h>
+#include "nntp.h"
 #endif
 
 #ifdef USE_HCACHE
@@ -130,9 +126,6 @@ options:\n\
 static void show_version (void)
 {
   struct utsname uts;
-#ifdef USE_LIBESMTP
-  char buf[STRING];
-#endif
 
   puts (mutt_make_version());
   puts (_(Notice));
@@ -165,11 +158,6 @@ static void show_version (void)
           stringprep_check_version (NULL), STRINGPREP_VERSION);
 #endif
 
-#ifdef USE_LIBESMTP
-  smtp_version (buf, sizeof (buf), 0);
-  printf ("  libESMTP %s\n", buf);
-#endif
-
 #ifdef USE_HCACHE
 #if defined(HAVE_QDBM)
   printf ("  qdbm %s\n", dpversion);
@@ -210,11 +198,6 @@ static void show_version (void)
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_LIBESMTP
-         "+USE_LIBESMTP  "
-#else
-         "-USE_LIBESMTP  "
-#endif
 #ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
 #else