Rocco Rutte:

[apps/madmutt.git] / main.c

diff --git a/main.c b/main.c
index a2805f8..ce8c1be 100644 (file)
--- a/main.c
+++ b/main.c
@@ -29,6 +29,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -226,6 +227,11 @@ static void show_version (void)
          "+USE_INODESORT   "
 #else
          "-USE_INODESORT   "
+#endif
+#if USE_HCACHE
+         "+USE_HCACHE  "
+#else
+         "-USE_HCACHE  "
 #endif
     );
   puts (
@@ -244,11 +250,6 @@ static void show_version (void)
 #else
          "-USE_IMAP  "
 #endif
-#ifdef IMAP_EDIT_THREADS
-         "+IMAP_EDIT_THREADS  "
-#else
-         "-IMAP_EDIT_THREADS  "
-#endif
 #ifdef USE_GSS
          "+USE_GSS  "
 #else
@@ -264,11 +265,6 @@ static void show_version (void)
 #else
          "-USE_GNUTLS  "
 #endif
-#ifdef USE_GNUTLS
-         "+USE_GNUTLS  "
-#else
-         "-USE_GNUTLS  "
-#endif
 #ifdef USE_SASL
          "+USE_SASL  "
 #else
@@ -421,16 +417,6 @@ static void show_version (void)
          "+HAVE_GETADDRINFO  "
 #else
          "-HAVE_GETADDRINFO  "
-#endif
-#if USE_HCACHE
-         "+USE_HCACHE  "
-#else
-         "-USE_HCACHE  "
-#endif
-#if USE_HCACHE
-         "+USE_HCACHE  "
-#else
-         "-USE_HCACHE  "
 #endif
     );
 
@@ -453,6 +439,7 @@ static void show_version (void)
 
   puts (_(ReachingUs));
 
+  puts (_("Mutt-ng is based on the following patches written for mutt:\n"));
   mutt_print_patchlist ();
 
   exit (0);
@@ -588,9 +575,9 @@ int main (int argc, char **argv)
       break;
 
     case 'd':
+      debug_setlevel(atoi(optarg));
 #ifdef DEBUG
-      debuglevel = atoi (optarg);
-      printf (_("Debugging at level %d.\n"), debuglevel);
+      printf (_("Debugging at level %d.\n"), atoi(optarg));
 #else
       printf _("DEBUG was not defined during compilation.  Ignored.\n");
 #endif