X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=3002fb7a035799e99183d4d453a300b0d4fad108;hp=f13f5a534c16969ad400eeedbb44cf3197b50fd3;hb=598ddfd9e5e0ea3fd368878e4bf8227014e478d5;hpb=55a276b42d6e3fa25bb4f8debf91bb97ad37ce33

diff --git a/main.c b/main.c
index f13f5a5..3002fb7 100644
--- a/main.c
+++ b/main.c
@@ -57,21 +57,12 @@ extern int optind;
 #include <depot.h>
 #elif defined(HAVE_GDBM)
 #include <gdbm.h>
-#elif defined(HAVE_DB4)
-#include <db.h>
 #endif
 #endif
 
-#ifdef USE_GNUTLS
 #include <gnutls/gnutls.h>
-#endif
-
 #include <gpgme.h>
 
-#ifdef USE_SSL
-#include <openssl/opensslv.h>
-#endif
-
 static const char *Notice = N_("\
 Copyright (C) 1996-2002 Michael R. Elkins and others.\n\
 Copyright (C) 2005 The Mutt-ng Team\n\
@@ -183,20 +174,10 @@ static void show_version (void)
   printf ("  qdbm %s\n", dpversion);
 #elif defined(HAVE_GDBM)
   printf ("  gdbm %s\n", gdbm_version);
-#elif defined(HAVE_DB4)
-  printf ("  DB4 %d.%d.%d\n", DB_VERSION_MAJOR, DB_VERSION_MINOR,
-          DB_VERSION_PATCH);
 #endif
 #endif
 
-#ifdef USE_GNUTLS
   printf ("  gnutls %s\n", LIBGNUTLS_VERSION);
-#endif
-
-#ifdef USE_SSL
-  printf ("  %s\n",OPENSSL_VERSION_TEXT);
-#endif
-
   printf ("  gpgme %s\n", GPGME_VERSION);
   puts (_("Compile Options:"));
 
@@ -233,16 +214,6 @@ static void show_version (void)
 #else
          "-USE_NNTP  "
 #endif
-#ifdef USE_SSL
-         "+USE_SSL  "
-#else
-         "-USE_SSL  "
-#endif
-#ifdef USE_GNUTLS
-         "+USE_GNUTLS  "
-#else
-         "-USE_GNUTLS  "
-#endif
 #ifdef USE_LIBESMTP
          "+USE_LIBESMTP  "
 #else
@@ -326,11 +297,6 @@ static void show_version (void)
          "+HAVE_GETSID  "
 #else
          "-HAVE_GETSID  "
-#endif
-#ifdef HAVE_GETADDRINFO
-         "+HAVE_GETADDRINFO  "
-#else
-         "-HAVE_GETADDRINFO  "
 #endif
     );
 
@@ -833,5 +799,6 @@ int main (int argc, char **argv)
   }
 
   luaM_shutdown();
+  mutt_sasl_shutdown();
   exit (0);
 }