X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=2e1b4d447b1a94fcccb0f85bca0d7281250044c8;hp=28d7f4ebe3889dd710251ad23aafa299dd24feaf;hb=785bb3cb4dd83ec1071998a64af74e333d076347;hpb=8fac066483c9ae3176984527c037190fca9dc7f0

diff --git a/main.c b/main.c
index 28d7f4e..2e1b4d4 100644
--- a/main.c
+++ b/main.c
@@ -32,6 +32,7 @@
 #include "sort.h"
 #include "keymap.h"
 #include "mutt_idna.h"
+#include "mutt_sasl.h"
 
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
@@ -57,8 +58,6 @@ extern int optind;
 #include <depot.h>
 #elif defined(HAVE_GDBM)
 #include <gdbm.h>
-#elif defined(HAVE_DB4)
-#include <db.h>
 #endif
 #endif
 
@@ -176,9 +175,6 @@ 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
 
@@ -187,11 +183,6 @@ static void show_version (void)
   puts (_("Compile Options:"));
 
   puts (
-#ifdef HOMESPOOL
-         "  +HOMESPOOL  "
-#else
-         "  -HOMESPOOL  "
-#endif
 #ifdef USE_SETGID
          "+USE_SETGID  "
 #else
@@ -231,11 +222,6 @@ static void show_version (void)
          "-HAVE_REGCOMP  "
 #endif
          "\n  "
-#ifdef HAVE_START_COLOR
-         "+HAVE_START_COLOR  "
-#else
-         "-HAVE_START_COLOR  "
-#endif
 #ifdef HAVE_TYPEAHEAD
          "+HAVE_TYPEAHEAD  "
 #else
@@ -282,12 +268,6 @@ static void show_version (void)
 #else
          "-HAVE_LANGINFO_CODESET  "
 #endif
-#ifdef HAVE_LANGINFO_YESEXPR
-         "+HAVE_LANGINFO_YESEXPR  "
-#else
-         "-HAVE_LANGINFO_YESEXPR  "
-#endif
-         "\n  "
 #ifdef HAVE_ICONV
          "+HAVE_ICONV  "
 #else
@@ -302,11 +282,6 @@ static void show_version (void)
          "+HAVE_GETSID  "
 #else
          "-HAVE_GETSID  "
-#endif
-#ifdef HAVE_GETADDRINFO
-         "+HAVE_GETADDRINFO  "
-#else
-         "-HAVE_GETADDRINFO  "
 #endif
     );
 
@@ -809,5 +784,6 @@ int main (int argc, char **argv)
   }
 
   luaM_shutdown();
+  mutt_sasl_shutdown();
   exit (0);
 }